use-ify opengl bits

Package-Manager: portage-2.1_pre4-r1

5 files changed, 65 insertions, 81 deletions

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index d4eafe0e8852..81f881708e78 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for x11-libs/vte
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.117 2006/03/24 15:21:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.118 2006/03/24 16:21:15 foser Exp $
 
   24 Mar 2006; Aron Griffis <agriffis@gentoo.org> vte-0.11.18.ebuild:
   Mark 0.11.18 stable on ia64
 
+  24 Mar 2006; Marinus Schraal <foser@gentoo.org> vte-0.12.0.ebuild :
+  Make opengl optional and minor cleanups
+
   19 Mar 2006; Markus Rothe <corsair@gentoo.org> vte-0.11.18.ebuild:
   Stable on ppc64
 
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 8862661e5bc0..89dac1b0f75d 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,17 +1,45 @@
-MD5 ac90c91e78afa902a22a715d0dda3d8a ChangeLog 13906
+MD5 fb27ff2ae663e7755bfb25a47aefdd1b ChangeLog 14016
+RMD160 16e48a7b6d9e736772073f4e25792b2cddd6d9cb ChangeLog 14016
+SHA256 1f62ac99d985cf8adfa925488d1be36d7c0048769b3b4e518c47dde3ee71f7d2 ChangeLog 14016
 MD5 41b41aaa36ba84805514d34f2d9b491f files/digest-vte-0.11.13-r2 64
+RMD160 bb6e040a45c3858eb4599131cb7b3c26e6d67c56 files/digest-vte-0.11.13-r2 64
+SHA256 9c6dd3b2b7d512c2880b1c9fc92d022d6a3ff3e50dd5b96d5c88da0bcde20538 files/digest-vte-0.11.13-r2 64
 MD5 71c3b1aad083c8366c3501d857d9b622 files/digest-vte-0.11.16-r1 64
-MD5 40760af0a48b104d3ac748c00bbbc0d6 files/digest-vte-0.11.17 64
+RMD160 78bb80ccd7002418bbd86c4cd0a602950d4a1fd4 files/digest-vte-0.11.16-r1 64
+SHA256 d33c761f6e387c8c700d4c271bbc6a7cc34c7cb89696af942515ebe0c4abc9df files/digest-vte-0.11.16-r1 64
 MD5 77b5db632db856e1cb6c0095ac817a5f files/digest-vte-0.11.18 64
+RMD160 65b9784ac25ee23cd868835861945858e776b817 files/digest-vte-0.11.18 64
+SHA256 30b008ab3015c18600e91a7ff9c33b4adbadf01ccf1e959373d315343ec6139c files/digest-vte-0.11.18 64
 MD5 479a2fa414f97d51d41c5118418d12d8 files/digest-vte-0.12.0 235
+RMD160 990755ea50a21b0db91d9c01e9fe379f3d4abc2f files/digest-vte-0.12.0 235
+SHA256 bf5b594511afb3a0d579f0bdbe5e8c8a257870909415e5e99571ac0a0b6d82f1 files/digest-vte-0.12.0 235
 MD5 f8d6220ac03de9b337c4b0ec5243f55f files/vte-0.11.13-memory_fix.patch 7661
+RMD160 f24d99c3b0ef9b094cc0c1b6913c03c4ec552168 files/vte-0.11.13-memory_fix.patch 7661
+SHA256 65e0f6f6849b68904b4bf1231b88c04f7193a31365af77158e5cd5ed4cd398de files/vte-0.11.13-memory_fix.patch 7661
 MD5 3d000a15f9aa0f3c44eb22175d54c314 files/vte-0.11.16-pkgconfig_libs_fix.patch 564
+RMD160 6ed538abaaabbe7153e7db7cc7494606bc679589 files/vte-0.11.16-pkgconfig_libs_fix.patch 564
+SHA256 91b76a00c74f3db4177a841cc14dfe2550ce3c1071b44d2af6ef4eb8350fc113 files/vte-0.11.16-pkgconfig_libs_fix.patch 564
 MD5 958781d1ff9822a3778d981228f9cc05 files/vte-0.11.18-line-scroll.patch 2236
+RMD160 71d3a5a3bbafceeec9080e85000ee607b1023a7e files/vte-0.11.18-line-scroll.patch 2236
+SHA256 3e2c52e09b1c026810deb1e08152e207e325def09b2df9cc080dd0b555c7d982 files/vte-0.11.18-line-scroll.patch 2236
 MD5 3805528034f3d01fa27e24f600618c0d files/vte-line-scroll.patch 2234
+RMD160 96dc248294da960119e6adb1012651803d9e0141 files/vte-line-scroll.patch 2234
+SHA256 7b83355aa1b96afdd30506617614ec1e02de7dc81a170f1d1c702c99c2b9ab07 files/vte-line-scroll.patch 2234
 MD5 31acc289fb190f9bdd0285147233eee0 files/vte-no_lazy_bindings.patch 419
+RMD160 f1da0134ad8bfcf91e44519cd21bd0d50249b035 files/vte-no_lazy_bindings.patch 419
+SHA256 4d4c0e41249eaa96b2ce918801882ef454ea2c7ab61cb3ed5bf87dbb2d46fdd6 files/vte-no_lazy_bindings.patch 419
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
+SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
 MD5 7dd7c2b3c82a64d42c27385b8a5fd21e vte-0.11.13-r2.ebuild 1403
+RMD160 9301fb707fb0cbaacccbe6a9b1846bdcb3324b81 vte-0.11.13-r2.ebuild 1403
+SHA256 df949332a1d270e65e1b03e2f3bde5f079f5d4e7c90b550f68a7c01b7b05c540 vte-0.11.13-r2.ebuild 1403
 MD5 4ad8d90fe29fd65d0789a535d0a5eb4f vte-0.11.16-r1.ebuild 1347
-MD5 7737f72cd3e8550e451a4106b0c7b18a vte-0.11.17.ebuild 1272
+RMD160 7b78e4263a0d3b8e2de37c453a7d672e8fb73561 vte-0.11.16-r1.ebuild 1347
+SHA256 d975d9cfa15aecce0704b6d8ae60103c01eef17fbaedaada35a3c2877c168e80 vte-0.11.16-r1.ebuild 1347
 MD5 069973d123ff152de200fc84a2492503 vte-0.11.18.ebuild 1287
-MD5 267cd7c92624346bef68e6c64dd27441 vte-0.12.0.ebuild 1298
+RMD160 d2d8ea28a0b889f4b74b36aee2fac57cd9d75db7 vte-0.11.18.ebuild 1287
+SHA256 aa60cdb25041def7e26a55f8109a54d2f973aa78320497a29cb94bc2442e2ae7 vte-0.11.18.ebuild 1287
+MD5 cfa700ebe4ac0421236b450e5d2ea52d vte-0.12.0.ebuild 1285
+RMD160 285890dc01d0160d339f3425dbe3b6a77daf0249 vte-0.12.0.ebuild 1285
+SHA256 dff0a0719781cbba835f7e22552451a8c214ff4736ebfc8d420acfa3474a518f vte-0.12.0.ebuild 1285
diff --git a/x11-libs/vte/files/digest-vte-0.11.17 b/x11-libs/vte/files/digest-vte-0.11.17
deleted file mode 100644
index 174fdea9c7fd..000000000000
--- a/x11-libs/vte/files/digest-vte-0.11.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bbe9710eca23984c884426a5d915f6eb vte-0.11.17.tar.bz2 943578
diff --git a/x11-libs/vte/vte-0.11.17.ebuild b/x11-libs/vte/vte-0.11.17.ebuild
deleted file mode 100644
index 32a2fc3b0d6a..000000000000
--- a/x11-libs/vte/vte-0.11.17.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.11.17.ebuild,v 1.1 2006/01/29 18:05:29 allanonjl Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Xft powered terminal widget"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc python"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2.2
-	>=x11-libs/pango-1.1
-	>=media-libs/freetype-2.0.2
-	media-libs/fontconfig
-	sys-libs/ncurses
-	python? (
-		>=dev-python/pygtk-2.4
-		>=dev-lang/python-2.2 )
-	virtual/xft"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-0.6 )
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-
-pkg_setup() {
-	G2CONF="$(use_enable debug debugging) $(use_enable python)"
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}/src"
-
-	# Apply the, shift-<up,down> scroll one
-	# line at a time patch.
-	epatch ${FILESDIR}/${PN}-line-scroll.patch
-
-	cd "${S}"
-	# Resolve all symbols at execution time for gnome-pty-helper. See bug
-	# #91617.
-	epatch ${FILESDIR}/${PN}-no_lazy_bindings.patch
-
-	cd gnome-pty-helper
-	WANT_AUTOMAKE=1.9
-	aclocal  || die "aclocal failed"
-	automake || die "automake failed"
-}
diff --git a/x11-libs/vte/vte-0.12.0.ebuild b/x11-libs/vte/vte-0.12.0.ebuild
index 200cccaa5965..e02af83dd47e 100644
--- a/x11-libs/vte/vte-0.12.0.ebuild
+++ b/x11-libs/vte/vte-0.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.12.0.ebuild,v 1.1 2006/03/13 20:05:25 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.12.0.ebuild,v 1.2 2006/03/24 16:21:15 foser Exp $
 
 inherit eutils gnome2 autotools
 
@@ -10,37 +10,44 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc python"
+IUSE="debug doc python opengl"
 
 RDEPEND=">=dev-libs/glib-2.0
-		 >=x11-libs/gtk+-2.2
-		 >=x11-libs/pango-1.1
-		 >=media-libs/freetype-2.0.2
-		   sys-devel/gettext
-		   media-libs/fontconfig
-		   sys-libs/ncurses
-		 ||	( ( x11-libs/libX11 ) virtual/x11 )
-		 virtual/opengl
-		 virtual/glu
-		 python?	(
-						>=dev-python/pygtk-2.4
-						>=dev-lang/python-2.2
-					)
-		 virtual/xft"
+	>=x11-libs/gtk+-2.2
+	>=x11-libs/pango-1.1
+	>=media-libs/freetype-2.0.2
+	media-libs/fontconfig
+	sys-libs/ncurses
+	python? (
+		>=dev-python/pygtk-2.4
+		>=dev-lang/python-2.2
+	)
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
+	|| ( x11-libs/libX11 virtual/x11 )
+	virtual/xft"
+
 DEPEND="${RDEPEND}
-		doc? ( >=dev-util/gtk-doc-1.0 )
-		>=dev-util/pkgconfig-0.9"
+	doc? ( >=dev-util/gtk-doc-1.0 )
+	>=dev-util/pkgconfig-0.9
+	sys-devel/gettext"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
-
 pkg_setup() {
+
 	G2CONF="$(use_enable debug debugging) \
-			$(use_enable python)          \
-			--with-xft2 --with-pangox --with-glx"
+		$(use_enable python) \
+		$(use_enable opengl glX) \
+		--with-xft2
+		--with-pangox"
+
 }
 
 src_unpack() {
+
 	unpack ${A}
 	cd ${S}
 
@@ -50,4 +57,5 @@ src_unpack() {
 
 	cd "${S}/gnome-pty-helper"
 	eautoreconf || die "eautoreconf failed"
+
 }