fix 0.10 first, then maybe we need to get to 0.8

4 files changed, 99 insertions, 8 deletions

diff --git a/x11-themes/gtk-engines-mist/ChangeLog b/x11-themes/gtk-engines-mist/ChangeLog
index 8dcdcee2a779..562af6f15ba6 100644
--- a/x11-themes/gtk-engines-mist/ChangeLog
+++ b/x11-themes/gtk-engines-mist/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/gtk-engines-mist
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-mist/ChangeLog,v 1.3 2003/06/19 09:48:44 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-mist/ChangeLog,v 1.4 2003/10/04 18:27:13 liquidx Exp $
+
+  04 Oct 2003; Alastair Tse <liquidx@gentoo.org> gtk-engines-mist-0.10.ebuild,
+  files/gtk-engines-mist-0.10-autoconf.patch:
+  fix gtk1 gtk2 detection in configure.
 
 *gtk-engines-mist-0.10 (19 Jun 2003)
 
diff --git a/x11-themes/gtk-engines-mist/Manifest b/x11-themes/gtk-engines-mist/Manifest
index 9db995200886..d0c3415babf9 100644
--- a/x11-themes/gtk-engines-mist/Manifest
+++ b/x11-themes/gtk-engines-mist/Manifest
@@ -1,8 +1,9 @@
-MD5 2f2d6141086a0ec923674d21dbdad3ea ChangeLog 750
+MD5 80fb9048268173588d678ee18cea9356 ChangeLog 916
+MD5 4311de9307a46e6034bb9ccd0164b2c1 gtk-engines-mist-0.10.ebuild 1114
 MD5 5b6d9d44b9e6dd9ad3851a6814097bac gtk-engines-mist-0.8-r1.ebuild 317
 MD5 3756e15be93e828202823624d5032738 gtk-engines-mist-0.8-r2.ebuild 319
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 08e75cfd70f702d3d76f2133fca5f70f gtk-engines-mist-0.10.ebuild 605
+MD5 397a6027ae11d4dd7a919470a0d3b1bb files/digest-gtk-engines-mist-0.10 72
 MD5 c6181c0651426d1bef6f31d09daf6c05 files/digest-gtk-engines-mist-0.8-r1 71
 MD5 c6181c0651426d1bef6f31d09daf6c05 files/digest-gtk-engines-mist-0.8-r2 71
-MD5 397a6027ae11d4dd7a919470a0d3b1bb files/digest-gtk-engines-mist-0.10 72
+MD5 23fd68bf284c81e757bc62a6763a5045 files/gtk-engines-mist-0.10-autoconf.patch 2355
diff --git a/x11-themes/gtk-engines-mist/files/gtk-engines-mist-0.10-autoconf.patch b/x11-themes/gtk-engines-mist/files/gtk-engines-mist-0.10-autoconf.patch
new file mode 100644
index 000000000000..9409ec913257
--- /dev/null
+++ b/x11-themes/gtk-engines-mist/files/gtk-engines-mist-0.10-autoconf.patch
@@ -0,0 +1,63 @@
+--- gtk-mist-engine-0.10/configure.in	2003-01-10 22:13:53.000000000 +0000
++++ gtk-mist-engine-0.10.new/configure.in	2003-10-04 18:29:19.049104896 +0100
+@@ -26,17 +26,40 @@
+ dnl Initialize libtool
+ AM_PROG_LIBTOOL
+ 
+-PKG_CHECK_MODULES(MIST, gtk+-2.0 >= 2.0.0,,
+-			AC_MSG_ERROR([GTK+-2.0 is required to compile mist]))
+-AC_SUBST(MIST_CFLAGS)
+-AC_SUBST(MIST_LIBS)
++AC_ARG_ENABLE(gtk-1, [  --enable-gtk-1          try to compile for GTK+ 1.X], gtk_1=$enableval, gtk_1="no")
++AC_ARG_ENABLE(gtk-2, [  --enable-gtk-2          try to compile for GTK+ 2.X], gtk_2=$enableval, gtk_2="yes")
++
++if test $gtk_1 = "yes"; then
++  gtk_config_progs="gtk-config gtk12-config"
++  AC_PATH_PROGS(gtk_config, $gtk_config_progs, no, /usr/bin)
++  if test $gtk_config = "no"; then
++     AC_MSG_ERROR(Could not find installation of GTK+. Try ./configure --help)
++  fi
++  GTK_VERSION=`$gtk_config --version`
++  GTK1_CFLAGS=`$gtk_config --cflags`
++  GTK1_LIBS=`$gtk_config --libs`
++  BUILD_SUBDIRS="gtk1"
++  THEME_SUBDIRS="gtk"
++fi
+ 
+-PKG_CHECK_MODULES(GTK1, gtk+ >= 1.2.10,,
+-			AC_MSG_ERROR([GTK+-1.2.10 is required to compile mist]))
+ AC_SUBST(GTK1_CFLAGS)
+-AC_SUBST(GTK1_LIBS)
++AC_SUBST(GTK1_LIBS) 
+ 
+-GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
++if test $gtk_2 = "yes"; then
++  PKG_CHECK_MODULES(SMOOTH_GTK2, gtk+-2.0 >= 2.0.0,,
++                          AC_MSG_ERROR([GTK+-2.0 is required]))
++                                                                       
++  GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
++  MIST_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
++  MIST_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
++  BUILD_SUBDIRS="$BUILD_SUBDIRS src"
++  THEME_SUBDIRS="$THEME_SUBDIRS gtk-2.0"
++fi
++
++AC_SUBST(MIST_CFLAGS)
++AC_SUBST(MIST_LIBS)
++AC_SUBST(BUILD_SUBDIRS)
++AC_SUBST(THEME_SUBDIRS)
+ AC_SUBST(GTK_VERSION)
+ 
+ # Checks for header files.
+--- gtk-mist-engine-0.10/Makefile.am	2003-01-10 22:13:42.000000000 +0000
++++ gtk-mist-engine-0.10.new/Makefile.am	2003-10-04 17:48:37.822227792 +0100
+@@ -1,3 +1,3 @@
+-SUBDIRS = gtk1 src Theme
++SUBDIRS = @BUILD_SUBDIRS@ Theme
+ 
+ EXTRA_DIST = autogen.sh
+--- gtk-mist-engine-0.10/Theme/Makefile.am	2003-01-12 23:02:00.000000000 +0000
++++ gtk-mist-engine-0.10.new/Theme/Makefile.am	2003-10-04 18:11:22.363785944 +0100
+@@ -1 +1 @@
+-SUBDIRS = gtk gtk-2.0 metacity-1
++SUBDIRS = @THEME_SUBDIRS@ metacity-1
diff --git a/x11-themes/gtk-engines-mist/gtk-engines-mist-0.10.ebuild b/x11-themes/gtk-engines-mist/gtk-engines-mist-0.10.ebuild
index 6e2d904b8676..36c2d595ba99 100644
--- a/x11-themes/gtk-engines-mist/gtk-engines-mist-0.10.ebuild
+++ b/x11-themes/gtk-engines-mist/gtk-engines-mist-0.10.ebuild
@@ -1,21 +1,44 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-mist/gtk-engines-mist-0.10.ebuild,v 1.1 2003/06/19 09:48:44 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-mist/gtk-engines-mist-0.10.ebuild,v 1.2 2003/10/04 18:27:13 liquidx Exp $
 
 inherit gtk-engines2
 
 MY_P="${P/engines-mist/mist-engine}"
 
 IUSE=""
-DESCRIPTION="GTK+2 Mist Theme Engine"
+DESCRIPTION="GTK+1 and GTK+2 Mist Theme Engine"
 HOMEPAGE="http://primates.ximian.com/~dave/mist/"
 SRC_URI="http://primates.ximian.com/~dave/mist/${MY_P}.tar.gz"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc"
 LICENSE="GPL-2"
 SLOT="2"
 
-DEPEND=">=x11-libs/gtk+-2
-	!x11-themes/gnome-themes"
+DEPEND="!x11-themes/gnome-themes"
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	# patch that adds --[enable|disable]-gtk-[1|2] - liquidx@g.o (04 Oct 03)
+	epatch ${FILESDIR}/${P}-autoconf.patch
+	cd ${S}; aclocal; automake; autoconf
+}
+
+src_compile() {
+	local myconf
+	if [ -n "${HAS_GTK1}" ]; then
+		myconf="${myconf} --enable-gtk-1"
+	else
+		myconf="${myconf} --disable-gtk-1"
+	fi
+	
+	if [ -n "${HAS_GTK2}" ]; then
+		myconf="${myconf} --enable-gtk-2"
+	else
+		myconf="${myconf} --disable-gtk-2"
+	fi
+	
+	econf ${myconf} || die "configure failed"
+	emake || die "make failed"
+}