Don't inherit from gtk-engines[2].eclass

(Portage version: 2.0.51.22-r2)

10 files changed, 147 insertions, 25 deletions

diff --git a/x11-themes/gtk-engines-flat/ChangeLog b/x11-themes/gtk-engines-flat/ChangeLog
index c20baeb2483d..78a7acc3802a 100644
--- a/x11-themes/gtk-engines-flat/ChangeLog
+++ b/x11-themes/gtk-engines-flat/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for x11-themes/gtk-engines-flat
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-flat/ChangeLog,v 1.10 2004/12/28 22:28:47 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-flat/ChangeLog,v 1.11 2005/08/02 09:31:06 leonardop Exp $
+
+*gtk-engines-flat-2.0-r2 (02 Aug 2005)
+
+  02 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gtk-engines-flat-2.0-r2.ebuild:
+  New revision. Added 'static' USE flag.
+
+  02 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gtk-engines-flat-2.0-r1.ebuild:
+  Don't inherit from gtk-engines2.eclass.
+
+*gtk-engines-flat-0.1-r1 (02 Aug 2005)
+
+  02 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gtk-engines-flat-0.1-r1.ebuild:
+  New revision. Added 'static' USE flag.
+
+  02 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gtk-engines-flat-0.1.ebuild:
+  Don't inherit from gtk-engines.eclass.
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/x11-themes/gtk-engines-flat/Manifest b/x11-themes/gtk-engines-flat/Manifest
index d4e6426d092f..5beb5c112d49 100644
--- a/x11-themes/gtk-engines-flat/Manifest
+++ b/x11-themes/gtk-engines-flat/Manifest
@@ -1,6 +1,10 @@
-MD5 b9315e29d24c7ed6cc7f17971a008801 ChangeLog 1242
-MD5 f596525417486ca43a6c1ed7c853c0d0 gtk-engines-flat-0.1.ebuild 311
-MD5 c826b9fc12acf45693ada7f06ed5f0d8 gtk-engines-flat-2.0-r1.ebuild 871
+MD5 67f11fa0a0d1a6976793ecb53499a7bb ChangeLog 1844
+MD5 c7921a8a109c5b2f1e9696eb2aa07453 gtk-engines-flat-0.1.ebuild 677
+MD5 4eada88607fe3745adbecf421c01f9ce gtk-engines-flat-2.0-r1.ebuild 849
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 31022bf8601ef8c090b015b3f4ebed89 files/digest-gtk-engines-flat-0.1 77
-MD5 8ea42ef8a20195a1dbea406c5b6737a5 files/digest-gtk-engines-flat-2.0-r1 130
+MD5 ce73d39918a28c61abfd2a33b8d724b2 gtk-engines-flat-0.1-r1.ebuild 826
+MD5 7ed36c46152b25ef7d7e997e3cba3130 gtk-engines-flat-2.0-r2.ebuild 998
+MD5 6fc9db62ed2aa87129b8498a9c78a4c4 files/digest-gtk-engines-flat-0.1 62
+MD5 6fc9db62ed2aa87129b8498a9c78a4c4 files/digest-gtk-engines-flat-0.1-r1 62
+MD5 cedaeeae6a1b5c48825ba761613e9cdb files/digest-gtk-engines-flat-2.0-r1 68
+MD5 cedaeeae6a1b5c48825ba761613e9cdb files/digest-gtk-engines-flat-2.0-r2 68
diff --git a/x11-themes/gtk-engines-flat/files/digest-gtk-engines-flat-0.1 b/x11-themes/gtk-engines-flat/files/digest-gtk-engines-flat-0.1
index 87059dcf6a23..adf8b05fc8bd 100644
--- a/x11-themes/gtk-engines-flat/files/digest-gtk-engines-flat-0.1
+++ b/x11-themes/gtk-engines-flat/files/digest-gtk-engines-flat-0.1
@@ -1 +1 @@
-MD5 5b9e6c974c2417b5793b5c930be29f5d gtk-engines-flat_0.1.orig.tar.gz 125868
+MD5 5b9e6c974c2417b5793b5c930be29f5d flat-1.2.x.tar.gz 125868
diff --git a/x11-themes/gtk-engines-flat/files/digest-gtk-engines-flat-0.1-r1 b/x11-themes/gtk-engines-flat/files/digest-gtk-engines-flat-0.1-r1
new file mode 100644
index 000000000000..adf8b05fc8bd
--- /dev/null
+++ b/x11-themes/gtk-engines-flat/files/digest-gtk-engines-flat-0.1-r1
@@ -0,0 +1 @@
+MD5 5b9e6c974c2417b5793b5c930be29f5d flat-1.2.x.tar.gz 125868
diff --git a/x11-themes/gtk-engines-flat/files/digest-gtk-engines-flat-2.0-r1 b/x11-themes/gtk-engines-flat/files/digest-gtk-engines-flat-2.0-r1
index 421728383e6e..c4a240d730a9 100644
--- a/x11-themes/gtk-engines-flat/files/digest-gtk-engines-flat-2.0-r1
+++ b/x11-themes/gtk-engines-flat/files/digest-gtk-engines-flat-2.0-r1
@@ -1,2 +1 @@
-MD5 5b9e6c974c2417b5793b5c930be29f5d Flat-1.2.x.tar.gz 125868
 MD5 a4d6866a518f05087bd7aef43a55432a gtk2flat-default.tar.gz 167554
diff --git a/x11-themes/gtk-engines-flat/files/digest-gtk-engines-flat-2.0-r2 b/x11-themes/gtk-engines-flat/files/digest-gtk-engines-flat-2.0-r2
new file mode 100644
index 000000000000..c4a240d730a9
--- /dev/null
+++ b/x11-themes/gtk-engines-flat/files/digest-gtk-engines-flat-2.0-r2
@@ -0,0 +1 @@
+MD5 a4d6866a518f05087bd7aef43a55432a gtk2flat-default.tar.gz 167554
diff --git a/x11-themes/gtk-engines-flat/gtk-engines-flat-0.1-r1.ebuild b/x11-themes/gtk-engines-flat/gtk-engines-flat-0.1-r1.ebuild
new file mode 100644
index 000000000000..ed04e67b31c6
--- /dev/null
+++ b/x11-themes/gtk-engines-flat/gtk-engines-flat-0.1-r1.ebuild
@@ -0,0 +1,30 @@
+# 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-flat/gtk-engines-flat-0.1-r1.ebuild,v 1.1 2005/08/02 09:31:06 leonardop Exp $
+
+MY_PN="gtk-flat-theme"
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Flat theme engine for GTK+ 1"
+HOMEPAGE="http://themes.freshmeat.net/projects/flat/"
+SRC_URI="http://download.freshmeat.net/themes/flat/flat-1.2.x.tar.gz"
+
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
+SLOT="1"
+LICENSE="GPL-2"
+IUSE="static"
+
+DEPEND="=x11-libs/gtk+-1.2*"
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	local myconf="$(use_enable static)"
+
+	econf $myconf || die "Configuration failed"
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS README
+}
diff --git a/x11-themes/gtk-engines-flat/gtk-engines-flat-0.1.ebuild b/x11-themes/gtk-engines-flat/gtk-engines-flat-0.1.ebuild
index 217358e2417d..9ceea84bbfdb 100644
--- a/x11-themes/gtk-engines-flat/gtk-engines-flat-0.1.ebuild
+++ b/x11-themes/gtk-engines-flat/gtk-engines-flat-0.1.ebuild
@@ -1,8 +1,23 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-flat/gtk-engines-flat-0.1.ebuild,v 1.5 2004/06/24 23:29:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-flat/gtk-engines-flat-0.1.ebuild,v 1.6 2005/08/02 09:31:06 leonardop Exp $
 
-DESCRIPTION="Flat theme engine for GTK+"
+MY_PN="gtk-flat-theme"
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Flat theme engine for GTK+ 1"
+HOMEPAGE="http://themes.freshmeat.net/projects/flat/"
+SRC_URI="http://download.freshmeat.net/themes/flat/flat-1.2.x.tar.gz"
+
+KEYWORDS="x86 ppc alpha sparc hppa amd64"
 SLOT="1"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="=x11-libs/gtk+-1.2*"
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
 
-inherit gtk-engines
+	dodoc AUTHORS README
+}
diff --git a/x11-themes/gtk-engines-flat/gtk-engines-flat-2.0-r1.ebuild b/x11-themes/gtk-engines-flat/gtk-engines-flat-2.0-r1.ebuild
index f2316aa07955..9b2ff5543c8d 100644
--- a/x11-themes/gtk-engines-flat/gtk-engines-flat-2.0-r1.ebuild
+++ b/x11-themes/gtk-engines-flat/gtk-engines-flat-2.0-r1.ebuild
@@ -1,23 +1,26 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-flat/gtk-engines-flat-2.0-r1.ebuild,v 1.9 2004/08/18 15:27:04 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-flat/gtk-engines-flat-2.0-r1.ebuild,v 1.10 2005/08/02 09:31:06 leonardop Exp $
 
-inherit gtk-engines2 gnuconfig
+inherit gnuconfig
 
-MY_PN=${PN/gtk-engines-flat/gtk-flat-theme}
+MY_PN="gtk-flat-theme"
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="GTK+2 Flat Theme Engine"
+SRC_URI="http://download.freshmeat.net/themes/gtk2flat/gtk2flat-default.tar.gz"
+HOMEPAGE="http://themes.freshmeat.net/projects/gtk2flat/"
 
-IUSE=""
-DESCRIPTION="GTK+1 and GTK+2 Flat Theme Engine"
-SRC_URI="mirror://gnome/teams/art.gnome.org/themes/gtk/Flat-1.2.x.tar.gz
-	http://download.freshmeat.net/themes/gtk2flat/gtk2flat-default.tar.gz"
-HOMEPAGE="http://art.gnome.org/show_theme.php?themeID=56&category=gtk
-	http://themes.freshmeat.net/projects/gtk2flat/"
 KEYWORDS="x86 ppc sparc alpha hppa amd64"
 LICENSE="GPL-2"
 SLOT="2"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2"
+
+DEPEND="${REPEND}
+	dev-util/pkgconfig"
 
-GTK1_S=${WORKDIR}/${MY_PN}-0.1
-GTK2_S=${WORKDIR}/${MY_PN}-2.0
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
@@ -25,3 +28,9 @@ src_unpack() {
 		gnuconfig_update ${WORKDIR}
 	fi
 }
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS README
+}
diff --git a/x11-themes/gtk-engines-flat/gtk-engines-flat-2.0-r2.ebuild b/x11-themes/gtk-engines-flat/gtk-engines-flat-2.0-r2.ebuild
new file mode 100644
index 000000000000..8c9ff9a1839c
--- /dev/null
+++ b/x11-themes/gtk-engines-flat/gtk-engines-flat-2.0-r2.ebuild
@@ -0,0 +1,43 @@
+# 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-flat/gtk-engines-flat-2.0-r2.ebuild,v 1.1 2005/08/02 09:31:06 leonardop Exp $
+
+inherit gnuconfig
+
+MY_PN="gtk-flat-theme"
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="GTK+2 Flat Theme Engine"
+SRC_URI="http://download.freshmeat.net/themes/gtk2flat/gtk2flat-default.tar.gz"
+HOMEPAGE="http://themes.freshmeat.net/projects/gtk2flat/"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="static"
+
+RDEPEND=">=x11-libs/gtk+-2"
+
+DEPEND="${REPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	if [[ ${ARCH} == "amd64" ]]; then
+		gnuconfig_update ${WORKDIR}
+	fi
+}
+
+src_compile() {
+	local myconf="$(use_enable static)"
+
+	econf $myconf || die "Configuration failed"
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS README
+}