Don't inherit from gtk-engines2.eclass. Only installs Gtk+1 engine.

Package-Manager: portage-2.0.51.22-r2

11 files changed, 82 insertions, 124 deletions

diff --git a/x11-themes/gtk-engines-smooth/ChangeLog b/x11-themes/gtk-engines-smooth/ChangeLog
index 40c6bf57972e..978ae224ff57 100644
--- a/x11-themes/gtk-engines-smooth/ChangeLog
+++ b/x11-themes/gtk-engines-smooth/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-themes/gtk-engines-smooth
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-smooth/ChangeLog,v 1.12 2005/06/08 20:00:43 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-smooth/ChangeLog,v 1.13 2005/08/02 12:23:53 leonardop Exp $
+
+*gtk-engines-smooth-0.6.0.1-r2 (02 Aug 2005)
+
+  02 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gtk-engines-smooth-0.6.0.1-r2.ebuild:
+  Added 'static' USE flag.
+
+*gtk-engines-smooth-0.6.0.1-r1 (02 Aug 2005)
+
+  02 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gtk-engines-smooth-0.6.0.1-r1.ebuild:
+  Don't inherit from gtk-engines2.eclass. Don't install Gtk+2 engine, it is
+  provided by x11-themes/gtk-engines. Re-SLOT accordingly. Stable on x86.
 
 *gtk-engines-smooth-0.6.0.1 (08 Jun 2005)
 
diff --git a/x11-themes/gtk-engines-smooth/Manifest b/x11-themes/gtk-engines-smooth/Manifest
index cf7e20ea2610..19ce6b2670d8 100644
--- a/x11-themes/gtk-engines-smooth/Manifest
+++ b/x11-themes/gtk-engines-smooth/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2342c5f68d757b80472c054486161d15 gtk-engines-smooth-0.5.4.ebuild 832
+MD5 ee16704e213165cbfcbacd18183db059 ChangeLog 2346
+MD5 4b3a2727db4854dc04794ceddf91303f gtk-engines-smooth-0.6.0.1-r2.ebuild 871
 MD5 079ea57c42907415daf32e42cffa88bd gtk-engines-smooth-0.5.6.ebuild 833
-MD5 d12936adeea2b0e3f5b5abaf6414f2c9 gtk-engines-smooth-0.6.0.1.ebuild 930
-MD5 ba7dee659cd9852e8e5a562a025315a7 ChangeLog 1885
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 e62374d4b6d79a1b563c5e7056bc281d gtk-engines-smooth-0.5.8.ebuild 928
-MD5 403a4820588ec69500c4ec551808aa50 files/digest-gtk-engines-smooth-0.5.4 75
+MD5 85c67e62cecb0cf10dd22ee76da8122b gtk-engines-smooth-0.6.0.1-r1.ebuild 842
+MD5 4a9d09787c648a2c7c348a096370ee2c files/digest-gtk-engines-smooth-0.6.0.1-r1 77
+MD5 4a9d09787c648a2c7c348a096370ee2c files/digest-gtk-engines-smooth-0.6.0.1-r2 77
 MD5 adebf847f2134c083010e8a903bbca6d files/digest-gtk-engines-smooth-0.5.6 75
-MD5 8d95b783acc3e25aad7a0e6b8ebe0d39 files/digest-gtk-engines-smooth-0.5.8 75
-MD5 4a9d09787c648a2c7c348a096370ee2c files/digest-gtk-engines-smooth-0.6.0.1 77
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzJ14BXaUFmZvwyMRAnAnAKCrN5sB7ewTKxIJmTyGujRTknAh3gCfTxpB
-oR42lFXV/BG34hgjiGdXv/U=
-=zt9p
------END PGP SIGNATURE-----
diff --git a/x11-themes/gtk-engines-smooth/files/digest-gtk-engines-smooth-0.5.4 b/x11-themes/gtk-engines-smooth/files/digest-gtk-engines-smooth-0.5.4
deleted file mode 100644
index 5182585a5683..000000000000
--- a/x11-themes/gtk-engines-smooth/files/digest-gtk-engines-smooth-0.5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c4dc16d6c1f7a8c7808e9735254b77bb gtk-smooth-engine-0.5.4.tar.gz 249941
diff --git a/x11-themes/gtk-engines-smooth/files/digest-gtk-engines-smooth-0.5.8 b/x11-themes/gtk-engines-smooth/files/digest-gtk-engines-smooth-0.5.8
deleted file mode 100644
index ec1da044c9df..000000000000
--- a/x11-themes/gtk-engines-smooth/files/digest-gtk-engines-smooth-0.5.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b4aebf85040b357124de926807dc22a gtk-smooth-engine-0.5.8.tar.gz 365680
diff --git a/x11-themes/gtk-engines-smooth/files/digest-gtk-engines-smooth-0.6.0.1 b/x11-themes/gtk-engines-smooth/files/digest-gtk-engines-smooth-0.6.0.1-r1
index c581cb34f33f..c581cb34f33f 100644
--- a/x11-themes/gtk-engines-smooth/files/digest-gtk-engines-smooth-0.6.0.1
+++ b/x11-themes/gtk-engines-smooth/files/digest-gtk-engines-smooth-0.6.0.1-r1
diff --git a/x11-themes/gtk-engines-smooth/files/digest-gtk-engines-smooth-0.6.0.1-r2 b/x11-themes/gtk-engines-smooth/files/digest-gtk-engines-smooth-0.6.0.1-r2
new file mode 100644
index 000000000000..c581cb34f33f
--- /dev/null
+++ b/x11-themes/gtk-engines-smooth/files/digest-gtk-engines-smooth-0.6.0.1-r2
@@ -0,0 +1 @@
+MD5 a2231118c8187649d1e634fdfe6f36de gtk-smooth-engine-0.6.0.1.tar.gz 466428
diff --git a/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.5.4.ebuild b/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.5.4.ebuild
deleted file mode 100644
index 810a0efa14de..000000000000
--- a/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.5.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.5.4.ebuild,v 1.6 2004/06/24 23:32:18 agriffis Exp $
-
-inherit gtk-engines2
-
-MY_P="gtk-smooth-engine-${PV}"
-
-IUSE=""
-DESCRIPTION="GTK+1 and GTK+2 Smooth Theme Engine"
-HOMEPAGE="http://sourceforge.net/projects/smooth-engine/"
-SRC_URI="mirror://sourceforge/smooth-engine/${MY_P}.tar.gz"
-KEYWORDS="x86 ~alpha ppc"
-LICENSE="GPL-2"
-SLOT="2"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	local myconf
-
-	[ -n "${HAS_GTK1}" ] \
-		&& myconf="${myconf} --enable-gtk-1" \
-		|| myconf="${myconf} --disable-gtk-1"
-
-	[ -n "${HAS_GTK2}" ] \
-		&& myconf="${myconf} --enable-gtk-2" \
-		|| myconf="${myconf} --disable-gtk-2"
-
-	gtk-engines2_src_compile ${myconf}
-}
-
diff --git a/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.5.8.ebuild b/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.5.8.ebuild
deleted file mode 100644
index 4c719da58120..000000000000
--- a/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.5.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.5.8.ebuild,v 1.7 2005/07/07 03:11:40 agriffis Exp $
-
-inherit gtk-engines2
-
-MY_P="gtk-smooth-engine-${PV}"
-
-IUSE="gtk"
-DESCRIPTION="GTK+1 and GTK+2 Smooth Theme Engine"
-HOMEPAGE="http://sourceforge.net/projects/smooth-engine/"
-SRC_URI="mirror://sourceforge/smooth-engine/${MY_P}.tar.gz"
-KEYWORDS="~x86 ~alpha ~ppc ~amd64 sparc"
-LICENSE="GPL-2"
-SLOT="2"
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="${DEPEND}
-	!x11-themes/gnome-themes
-	gtk? ( media-libs/gdk-pixbuf )"
-
-src_compile() {
-	local myconf
-
-	[ -n "${HAS_GTK1}" ] \
-		&& myconf="${myconf} --enable-gtk-1" \
-		|| myconf="${myconf} --disable-gtk-1"
-
-	[ -n "${HAS_GTK2}" ] \
-		&& myconf="${myconf} --enable-gtk-2" \
-		|| myconf="${myconf} --disable-gtk-2"
-
-	gtk-engines2_src_compile ${myconf}
-}
-
diff --git a/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.6.0.1-r1.ebuild b/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.6.0.1-r1.ebuild
new file mode 100644
index 000000000000..ef884e07f913
--- /dev/null
+++ b/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.6.0.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.6.0.1-r1.ebuild,v 1.1 2005/08/02 12:23:53 leonardop Exp $
+
+MY_P="gtk-smooth-engine-${PV}"
+
+DESCRIPTION="GTK+1 Smooth Theme Engine"
+HOMEPAGE="http://sourceforge.net/projects/smooth-engine/"
+SRC_URI="mirror://sourceforge/smooth-engine/${MY_P}.tar.gz"
+KEYWORDS="x86 ~alpha ~ppc ~amd64 sparc"
+LICENSE="GPL-2"
+SLOT="1"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="=x11-libs/gtk+-1.2*
+	media-libs/gdk-pixbuf"
+
+src_compile() {
+	local myconf="--enable-gtk-1 --disable-gtk-2"
+
+	econf $myconf || die "Configuration failed"
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS NEWS README
+}
diff --git a/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.6.0.1-r2.ebuild b/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.6.0.1-r2.ebuild
new file mode 100644
index 000000000000..32e813a2cb81
--- /dev/null
+++ b/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.6.0.1-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.6.0.1-r2.ebuild,v 1.1 2005/08/02 12:23:53 leonardop Exp $
+
+MY_P="gtk-smooth-engine-${PV}"
+
+DESCRIPTION="GTK+1 Smooth Theme Engine"
+HOMEPAGE="http://sourceforge.net/projects/smooth-engine/"
+SRC_URI="mirror://sourceforge/smooth-engine/${MY_P}.tar.gz"
+KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~sparc"
+LICENSE="GPL-2"
+SLOT="1"
+IUSE="static"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="=x11-libs/gtk+-1.2*
+	media-libs/gdk-pixbuf"
+
+src_compile() {
+	local myconf="--enable-gtk-1 --disable-gtk-2 $(use_enable static)"
+
+	econf $myconf || die "Configuration failed"
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS NEWS README
+}
diff --git a/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.6.0.1.ebuild b/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.6.0.1.ebuild
deleted file mode 100644
index 9dab689d30cc..000000000000
--- a/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.6.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-smooth/gtk-engines-smooth-0.6.0.1.ebuild,v 1.3 2005/07/07 03:11:40 agriffis Exp $
-
-inherit gtk-engines2
-
-MY_P="gtk-smooth-engine-${PV}"
-
-IUSE="gtk"
-DESCRIPTION="GTK+1 and GTK+2 Smooth Theme Engine"
-HOMEPAGE="http://sourceforge.net/projects/smooth-engine/"
-SRC_URI="mirror://sourceforge/smooth-engine/${MY_P}.tar.gz"
-KEYWORDS="~x86 ~alpha ~ppc ~amd64 sparc"
-LICENSE="GPL-2"
-SLOT="2"
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="${DEPEND}
-	!x11-themes/gnome-themes
-	gtk? ( media-libs/gdk-pixbuf )"
-
-src_compile() {
-	local myconf
-
-	[ -n "${HAS_GTK1}" ] \
-		&& myconf="${myconf} --enable-gtk-1" \
-		|| myconf="${myconf} --disable-gtk-1"
-
-	[ -n "${HAS_GTK2}" ] \
-		&& myconf="${myconf} --enable-gtk-2" \
-		|| myconf="${myconf} --disable-gtk-2"
-
-	gtk-engines2_src_compile ${myconf}
-}
-