Splitting into versions 0.12 and 2.6.x. Don't inherit from gtk-engines2.eclas. Finally resolves bug #24439, yay!

Package-Manager: portage-2.0.51.22-r2

11 files changed, 118 insertions, 99 deletions

diff --git a/x11-themes/gtk-engines/ChangeLog b/x11-themes/gtk-engines/ChangeLog
index b32c7dda1ae5..88a9c4f183be 100644
--- a/x11-themes/gtk-engines/ChangeLog
+++ b/x11-themes/gtk-engines/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-themes/gtk-engines
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.32 2005/07/29 00:40:06 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.33 2005/08/03 06:38:09 leonardop Exp $
+
+*gtk-engines-2.6.4-r1 (03 Aug 2005)
+
+  03 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gtk-engines-2.6.4-r1.ebuild:
+  Added 'static' and 'accessibility' USE flags. The latter controls the
+  installation of the HighContrast engine.
+
+*gtk-engines-2.6.3-r1 (03 Aug 2005)
+*gtk-engines-0.12 (03 Aug 2005)
+
+  03 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gtk-engines-0.12.ebuild, gtk-engines-2.6.3-r1.ebuild:
+  Don't inherit from gtk-engines2.eclass. Split and re-slot the ebuilds
+  accordingly. Removed unnecessary blocks. Resolves bug #24439.
 
 *gtk-engines-2.6.4 (28 Jul 2005)
 
diff --git a/x11-themes/gtk-engines/Manifest b/x11-themes/gtk-engines/Manifest
index b5e07aa2afb2..10d6c9799e26 100644
--- a/x11-themes/gtk-engines/Manifest
+++ b/x11-themes/gtk-engines/Manifest
@@ -1,7 +1,9 @@
-MD5 d32bfef4f1e5cc4dde062344e9ba6fa6 ChangeLog 3670
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 eff64dd5f9fd7da1e19e8728668140bc gtk-engines-2.6.4.ebuild 1413
-MD5 faf7e476e0218841ba5954111082d274 gtk-engines-2.6.3.ebuild 1442
-MD5 4140f5ec3bb123809037e9631907ab01 files/digest-gtk-engines-2.6.4 138
-MD5 5c9d7246937d4b75354237464ca035fb files/digest-gtk-engines-2.6.3 138
+MD5 b98fc02fa6d752f7b02bd8c8327b89a2 ChangeLog 4226
+MD5 5d66490f8124c366971401bea3804de1 gtk-engines-0.12.ebuild 818
+MD5 36faf46cc298a5e4b601aafac15ec93b metadata.xml 568
+MD5 494cf28d7e4ead9b70574215a6656f57 gtk-engines-2.6.3-r1.ebuild 734
+MD5 3831d6200fc8ae2530fa41bfbb459b04 gtk-engines-2.6.4-r1.ebuild 681
+MD5 c05083a16f957fda1c27e0b0cfc91005 files/digest-gtk-engines-0.12 68
+MD5 a544bee199fe05aa866462a7633f45ec files/digest-gtk-engines-2.6.3-r1 70
+MD5 c35ea0b6f5a0ba8d0c5fbb599fd0e23e files/digest-gtk-engines-2.6.4-r1 70
 MD5 cd6c6ed17e724aa3ae5aea4dd904477e files/gtk-engines-2.6.3-fix_clearlooks_path.patch 1136
diff --git a/x11-themes/gtk-engines/files/digest-gtk-engines-0.12 b/x11-themes/gtk-engines/files/digest-gtk-engines-0.12
new file mode 100644
index 000000000000..f124fbdcb2a5
--- /dev/null
+++ b/x11-themes/gtk-engines/files/digest-gtk-engines-0.12
@@ -0,0 +1 @@
+MD5 c867d1ebd6dbea355765d689a11330ec gtk-engines-0.12.tar.gz 653438
diff --git a/x11-themes/gtk-engines/files/digest-gtk-engines-2.6.3 b/x11-themes/gtk-engines/files/digest-gtk-engines-2.6.3-r1
index a20a6b9c681e..e010637bc267 100644
--- a/x11-themes/gtk-engines/files/digest-gtk-engines-2.6.3
+++ b/x11-themes/gtk-engines/files/digest-gtk-engines-2.6.3-r1
@@ -1,2 +1 @@
-MD5 c867d1ebd6dbea355765d689a11330ec gtk-engines-0.12.tar.gz 653438
 MD5 ba5975f8ab390fa43fc0bf94f4a3b023 gtk-engines-2.6.3.tar.bz2 469402
diff --git a/x11-themes/gtk-engines/files/digest-gtk-engines-2.6.4 b/x11-themes/gtk-engines/files/digest-gtk-engines-2.6.4-r1
index 7b2591c79a76..2f25e2f9d5b0 100644
--- a/x11-themes/gtk-engines/files/digest-gtk-engines-2.6.4
+++ b/x11-themes/gtk-engines/files/digest-gtk-engines-2.6.4-r1
@@ -1,2 +1 @@
-MD5 c867d1ebd6dbea355765d689a11330ec gtk-engines-0.12.tar.gz 653438
 MD5 3389a92b62b9c8b916fbb52c4529f072 gtk-engines-2.6.4.tar.bz2 477425
diff --git a/x11-themes/gtk-engines/gtk-engines-0.12.ebuild b/x11-themes/gtk-engines/gtk-engines-0.12.ebuild
new file mode 100644
index 000000000000..141be2307f3a
--- /dev/null
+++ b/x11-themes/gtk-engines/gtk-engines-0.12.ebuild
@@ -0,0 +1,33 @@
+# 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/gtk-engines-0.12.ebuild,v 1.1 2005/08/03 06:38:09 leonardop Exp $
+
+GNOME_TARBALL_SUFFIX="gz"
+inherit gnome.org gnuconfig
+
+DESCRIPTION="GTK+1 standard engines and themes"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="=x11-libs/gtk+-1.2*
+	>=media-libs/imlib-1.8"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	if use alpha || use amd64 || use ppc64 ; then
+		gnuconfig_update || die 'gnuconfig_update failed'
+		libtoolize --force || die 'libtoolize failed'
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/x11-themes/gtk-engines/gtk-engines-2.6.3-r1.ebuild b/x11-themes/gtk-engines/gtk-engines-2.6.3-r1.ebuild
new file mode 100644
index 000000000000..17eba153b7dc
--- /dev/null
+++ b/x11-themes/gtk-engines/gtk-engines-2.6.3-r1.ebuild
@@ -0,0 +1,29 @@
+# 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/gtk-engines-2.6.3-r1.ebuild,v 1.1 2005/08/03 06:38:09 leonardop Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="GTK+2 standard engines and themes"
+HOMEPAGE="http://www.gtk.org/"
+
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="2"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	!<=x11-themes/gnome-themes-2.8.2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Install the clearlooks engine in the right location
+	epatch ${FILESDIR}/${P}-fix_clearlooks_path.patch
+}
diff --git a/x11-themes/gtk-engines/gtk-engines-2.6.3.ebuild b/x11-themes/gtk-engines/gtk-engines-2.6.3.ebuild
deleted file mode 100644
index 2fd99d0c92a3..000000000000
--- a/x11-themes/gtk-engines/gtk-engines-2.6.3.ebuild
+++ /dev/null
@@ -1,45 +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/gtk-engines-2.6.3.ebuild,v 1.13 2005/07/12 00:16:41 geoman Exp $
-
-inherit gtk-engines2 gnuconfig
-
-GTK1_VER="0.12"
-GTK2_VER="${PV}"
-PVP=(${PV//[-._]/ })
-
-DESCRIPTION="GTK+1 and GTK+2 Theme Engines from GNOME including Pixmap, Metal, Raleigh, Redmond95, Raleigh and Notif"
-SRC_URI="mirror://gnome/sources/${PN}/${GTK1_VER}/${PN}-${GTK1_VER}.tar.gz
-	mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${PN}-${GTK2_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="${DEPEND}
-	!x11-themes/gtk-engines-crux
-	!x11-themes/gtk-engines-lighthouseblue
-	!x11-themes/gtk-engines-metal
-	!x11-themes/gtk-engines-mist
-	!x11-themes/gtk-engines-redmond95
-	!x11-themes/gtk-engines-smooth
-	!>=x11-themes/gtk-engines-thinice-2
-	!<=x11-themes/gnome-themes-2.8.2"
-
-[ -n "${HAS_GTK1}" ] && DEPEND="${DEPEND} >=media-libs/imlib-1.8"
-
-GTK1_S=${WORKDIR}/${PN}-${GTK1_VER}
-GTK2_S=${WORKDIR}/${PN}-${GTK2_VER}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-fix_clearlooks_path.patch
-	if use alpha || use amd64 || use ppc64 ; then
-		gnuconfig_update || die 'gnuconfig_update failed'
-		( cd $GTK1_S && libtoolize --force ) || die 'libtoolize1 failed'
-		( cd $GTK2_S && libtoolize --force ) || die 'libtoolize2 failed'
-	fi
-}
diff --git a/x11-themes/gtk-engines/gtk-engines-2.6.4-r1.ebuild b/x11-themes/gtk-engines/gtk-engines-2.6.4-r1.ebuild
new file mode 100644
index 000000000000..e221d6402a6f
--- /dev/null
+++ b/x11-themes/gtk-engines/gtk-engines-2.6.4-r1.ebuild
@@ -0,0 +1,22 @@
+# 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/gtk-engines-2.6.4-r1.ebuild,v 1.1 2005/08/03 06:38:09 leonardop Exp $
+
+inherit gnome2
+
+DESCRIPTION="GTK+2 standard engines and themes"
+HOMEPAGE="http://www.gtk.org/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="2"
+IUSE="accessibility static"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	!<=x11-themes/gnome-themes-2.8.2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+G2CONF="${G2CONF} $(use_enable static) $(use_enable accessibility hc)"
diff --git a/x11-themes/gtk-engines/gtk-engines-2.6.4.ebuild b/x11-themes/gtk-engines/gtk-engines-2.6.4.ebuild
deleted file mode 100644
index 825f90c7210f..000000000000
--- a/x11-themes/gtk-engines/gtk-engines-2.6.4.ebuild
+++ /dev/null
@@ -1,44 +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/gtk-engines-2.6.4.ebuild,v 1.1 2005/07/29 00:40:06 leonardop Exp $
-
-inherit gtk-engines2 gnuconfig
-
-GTK1_VER="0.12"
-GTK2_VER="${PV}"
-PVP=(${PV//[-._]/ })
-
-DESCRIPTION="GTK+1 and GTK+2 Theme Engines from GNOME including Pixmap, Metal, Raleigh, Redmond95, Raleigh and Notif"
-SRC_URI="mirror://gnome/sources/${PN}/${GTK1_VER}/${PN}-${GTK1_VER}.tar.gz
-	mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${PN}-${GTK2_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2.6
-	!x11-themes/gtk-engines-crux
-	!x11-themes/gtk-engines-lighthouseblue
-	!x11-themes/gtk-engines-metal
-	!x11-themes/gtk-engines-mist
-	!x11-themes/gtk-engines-redmond95
-	!x11-themes/gtk-engines-smooth
-	!>=x11-themes/gtk-engines-thinice-2
-	!<=x11-themes/gnome-themes-2.8.2"
-
-[ -n "${HAS_GTK1}" ] && DEPEND="${DEPEND} >=media-libs/imlib-1.8"
-
-GTK1_S=${WORKDIR}/${PN}-${GTK1_VER}
-GTK2_S=${WORKDIR}/${PN}-${GTK2_VER}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	if use alpha || use amd64 || use ppc64 ; then
-		gnuconfig_update || die 'gnuconfig_update failed'
-		( cd $GTK1_S && libtoolize --force ) || die 'libtoolize1 failed'
-		( cd $GTK2_S && libtoolize --force ) || die 'libtoolize2 failed'
-	fi
-}
diff --git a/x11-themes/gtk-engines/metadata.xml b/x11-themes/gtk-engines/metadata.xml
index da6fd63d0085..1131e5f9b28a 100644
--- a/x11-themes/gtk-engines/metadata.xml
+++ b/x11-themes/gtk-engines/metadata.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+  <herd>gnome</herd>
+  <longdescription>
+    This package contains some standard themes and theme engines for
+    GTK+. Version 0.12 provides engines and themes for GTK+ 1,
+    including Pixmap, Metal, Redmond95, Notif and Raleigh. Versions
+    2.x provide engines and themes for GTK+ 2, including Clearlooks,
+    Crux, HighContrast, Industrial, Lighthouseblue, Metal, Mist,
+    Redmond, Smooth and Thinice.
+  </longdescription>
 </pkgmetadata>