Fix split qt4 deps wrt bug 217161 AGAIN! Drop old ebuilds.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 15 insertions, 141 deletions

diff --git a/media-gfx/openmesh/ChangeLog b/media-gfx/openmesh/ChangeLog
index b627155905e1..101c44056e39 100644
--- a/media-gfx/openmesh/ChangeLog
+++ b/media-gfx/openmesh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/openmesh
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.14 2009/04/17 20:45:34 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.15 2009/06/25 18:04:10 yngwin Exp $
+
+  25 Jun 2009; Ben de Groot <yngwin@gentoo.org> openmesh-1.0.0.ebuild,
+  -openmesh-1.9.5.ebuild, -openmesh-1.9.6-r1.ebuild,
+  openmesh-1.9.6-r2.ebuild:
+  Fix split qt4 deps wrt bug 217161 AGAIN! Drop old ebuilds.
 
   17 Apr 2009; Justin Bronder <jsbronder@gentoo.org>
   +files/QGLViewerWidget-hh-gcc-4.3-include-fix.patch,
diff --git a/media-gfx/openmesh/Manifest b/media-gfx/openmesh/Manifest
index 5009cc6fdf72..8015bdb5e3b6 100644
--- a/media-gfx/openmesh/Manifest
+++ b/media-gfx/openmesh/Manifest
@@ -1,21 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX QGLViewerWidget-hh-gcc-4.3-include-fix.patch 676 RMD160 2013468db4ca9759211d02758992b3b6e177eb70 SHA1 50cc466dd831f945e5fee5cf82461711f2126d20 SHA256 89b45de09e182f603d20226f6c4ed11ad808d13bd1b1ade308474687b780a3e3
 AUX openmesh-1.0.0-gcc41.patch 3925 RMD160 ab4ed625667063776307d04c3a0fc5107459cfef SHA1 928d3d40dd01311b38f5e1520d77b3ad05f0d07c SHA256 9514b94f4f55e9ec7c73675dcd57e0f13d7aa7d184429e36237a36a9be50ba41
 DIST OpenMesh-1.9.6.tar.bz2 498618 RMD160 ebb24758242ebf9e8c0b853a78631fd5542318ea SHA1 2d337bf558c74a3a004f246b5d92f74b569fc78b SHA256 07ed3a915b567831f2d0433b09767f80abd789fbc76dd6390231c60e3eeadd4a
 DIST OpenMesh_1.0.0.tgz 4911191 RMD160 2a90206dc51677b2cb56f5af9f1cfc2d851f9404 SHA1 47e448718e27db3c1ccae754d00a650472db5ecc SHA256 025c5af3b5af9cae7983f2322579f8aa5a45ac9f195123a8c09a0645dfc2e7c4
-DIST OpenMesh_1.9.5.tar.gz 302155 RMD160 3ba7a3bae7001380cee07817caf99ee591e16312 SHA1 6b749cc9c4629c984f848728e75b559a05cbdbf7 SHA256 cc1c6de546628e5db8a6a90d98a37f6e4b6568989b407d993c556bd4d08fc277
-EBUILD openmesh-1.0.0.ebuild 1357 RMD160 bf04ea791ff903561ceb84d48ef276fc6285f2a5 SHA1 e7aaf7bf2952f196e2f0d7aa543e8670b58e89a4 SHA256 9110eeef15da888b5d118154b384ce4945fd7b994b826fd83f2a9585b35438a0
-EBUILD openmesh-1.9.5.ebuild 1430 RMD160 b4695a02381a9942442fd7171c99cdde75117eb3 SHA1 a104a0af030b32434f830d5f553532bc5b06ad83 SHA256 a79788b43bac485ca014a5629e93be44ff1b80831fa500fda19fa126dc3763fd
-EBUILD openmesh-1.9.6-r1.ebuild 1463 RMD160 3a7836a5047144a69f44a0af02a60d51999429c4 SHA1 92e954a14c8641e0694228567b77875b5aa7e939 SHA256 9b0ebb6b81290fcacff574421520282205e4bfdc32a7cdd16352f63c16649d47
-EBUILD openmesh-1.9.6-r2.ebuild 1637 RMD160 8dc4c8e0937ac48d29dbca2efec045eafc128e23 SHA1 037d18c5b22bfd1a7cbdbabcae30e0f9c949c422 SHA256 f4ab02e5dcca071092bfbfeb58a33196294a87b36f4cf907ebc2ede65a3b9504
-MISC ChangeLog 2508 RMD160 0db44f0f1538d699afadd1ecda0957eb9beddf99 SHA1 5edb47c9b7c8f9ff5abd079625fad52483b87376 SHA256 34a0547d2d19fa586359751d27824a90032032e0fe19361200c7fd8466a02c7a
+EBUILD openmesh-1.0.0.ebuild 1329 RMD160 5b1b0d65d7ae38db1afe99a1513eb490d4119e24 SHA1 405085c131b3912700731b4fed0451265bb9f3f2 SHA256 80e1ed52cba56f0b99d91943483dc1d9d41cde3c93f4ac26b52818f518a5aac5
+EBUILD openmesh-1.9.6-r2.ebuild 1649 RMD160 52cd0e794f7dc4bfe0ac4c6568e2461d6d2508f1 SHA1 1d11fe2def5839670233df8fd15221ef744419e9 SHA256 2d9882dd726e3083b667393749d12101ab8cc6bd3b82cb6d5dbede7c20914d8d
+MISC ChangeLog 2719 RMD160 2fa47676e4a27ccf4fc457c699e735d49f9dad4e SHA1 8aecc397475edb7db26c775102f2d406827a5ef0 SHA256 6e02dc5dbcf644be973b08d264378c67b36bd3c934057aa3ac80bc390055baec
 MISC metadata.xml 720 RMD160 63cd57c75c7dff62a72fd8232e1f3b1ce5c1ac38 SHA1 c93c3c8d79018623f8ebb70a60be1e40ba38a2df SHA256 68ba8265b818feed768b7c6889a7136e261a92ab36b284ccc3d916bb51d01bad
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkno6nMACgkQ4MrvBE1wQ8mRmwCglfc4a2xwvv2elzJaRhmTXiX2
-7ocAn1kAh1ARxjJ25ACxMCtm+C6HOufw
-=jIg5
------END PGP SIGNATURE-----
diff --git a/media-gfx/openmesh/openmesh-1.0.0.ebuild b/media-gfx/openmesh/openmesh-1.0.0.ebuild
index 1bab63ca58de..1f89502f6e47 100644
--- a/media-gfx/openmesh/openmesh-1.0.0.ebuild
+++ b/media-gfx/openmesh/openmesh-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.0.0.ebuild,v 1.5 2008/12/18 03:14:08 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.0.0.ebuild,v 1.6 2009/06/25 18:04:10 yngwin Exp $
 
 EAPI="1"
 inherit eutils
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="qt4 debug"
 
-RDEPEND="qt4? ( || ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* ) )"
+RDEPEND="qt4? ( x11-libs/qt-gui:4 )"
 DEPEND="dev-util/acgmake
 	${RDEPEND}"
 
diff --git a/media-gfx/openmesh/openmesh-1.9.5.ebuild b/media-gfx/openmesh/openmesh-1.9.5.ebuild
deleted file mode 100644
index 6079df6f103d..000000000000
--- a/media-gfx/openmesh/openmesh-1.9.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.9.5.ebuild,v 1.4 2008/12/18 03:14:08 jsbronder Exp $
-
-EAPI="1"
-inherit eutils
-
-MY_PN="OpenMesh"
-MY_P=${MY_PN}_${PV}
-S=${WORKDIR}/${MY_PN}
-DESCRIPTION="A generic and efficient data structure for representing and manipulating polygonal meshes"
-HOMEPAGE="http://www.openmesh.org/"
-SRC_URI="http://www-i8.informatik.rwth-aachen.de/${MY_PN}/downloads/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4 debug"
-
-RDEPEND="qt4? ( || ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* ) )"
-DEPEND=">=dev-util/acgmake-1.2-r2
-	>=sys-apps/findutils-4.3.0
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use qt4 || sed -i "s:Apps::" ACGMakefile
-}
-
-src_compile() {
-	if use debug; then
-		export CXXDEFS="-UNDEBUG -DDEBUG"
-	else
-		export CXXDEFS="-DNDEBUG -UDEBUG"
-	fi
-	acgmake -env || die
-
-	# fix insecure runpaths
-	TMPDIR="${S}" scanelf -BXRr "${S}" -o /dev/null || die
-}
-
-src_install() {
-	local l
-
-	for l in $(find "${S}"/{Core,Tools} -name '*.so'); do
-		dolib ${l} || die
-	done
-
-	make clean
-
-	find . -name 'ACGMakefile' -delete || die
-	find . -name '*.vcproj' -delete || die
-	rm -rf $(find "${S}" -type d -name 'Linux_gcc*_env') || die
-
-	dodir /usr/include/${MY_PN}
-
-	cp -a Core "${D}"/usr/include/${MY_PN}
-	cp -a Tools "${D}"/usr/include/${MY_PN}
-}
diff --git a/media-gfx/openmesh/openmesh-1.9.6-r1.ebuild b/media-gfx/openmesh/openmesh-1.9.6-r1.ebuild
deleted file mode 100644
index 941112255fc5..000000000000
--- a/media-gfx/openmesh/openmesh-1.9.6-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.9.6-r1.ebuild,v 1.2 2008/12/18 03:14:08 jsbronder Exp $
-
-EAPI="2"
-inherit eutils
-
-MY_PN="OpenMesh"
-S=${WORKDIR}/${MY_PN}
-DESCRIPTION="A generic and efficient data structure for representing and manipulating polygonal meshes"
-HOMEPAGE="http://www.openmesh.org/"
-SRC_URI="http://www-i8.informatik.rwth-aachen.de/${MY_PN}/downloads/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4 debug"
-
-RDEPEND="qt4? (
-		|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*[opengl] )
-		virtual/glut )"
-DEPEND=">=dev-util/acgmake-1.4
-	>=sys-apps/findutils-4.3.0
-	${RDEPEND}"
-
-src_prepare() {
-	use qt4 || sed -i "s:Apps::" ACGMakefile
-}
-
-src_compile() {
-	if use debug; then
-		export CXXDEFS="-UNDEBUG -DDEBUG"
-	else
-		export CXXDEFS="-DNDEBUG -UDEBUG"
-	fi
-	acgmake -env || die
-
-	# fix insecure runpaths
-	TMPDIR="${S}" scanelf -BXRr "${S}" -o /dev/null || die
-}
-
-src_install() {
-	local l
-
-	for l in $(find "${S}"/{Core,Tools} -name '*.so'); do
-		dolib ${l} || die
-	done
-
-	# Clean up manually as acgmake doesn't do a decent job.
-	find . -name 'ACGMakefile' -delete || die
-	find . -name '*.vcproj' -delete || die
-	rm -rf $(find "${S}" -type d -name 'Linux_gcc*_env') || die
-
-	dodir /usr/include/${MY_PN}
-
-	cp -a Core "${D}"/usr/include/${MY_PN}
-	cp -a Tools "${D}"/usr/include/${MY_PN}
-}
diff --git a/media-gfx/openmesh/openmesh-1.9.6-r2.ebuild b/media-gfx/openmesh/openmesh-1.9.6-r2.ebuild
index 53399b3dc4de..951fd82d0811 100644
--- a/media-gfx/openmesh/openmesh-1.9.6-r2.ebuild
+++ b/media-gfx/openmesh/openmesh-1.9.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.9.6-r2.ebuild,v 1.3 2009/04/17 20:45:34 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.9.6-r2.ebuild,v 1.4 2009/06/25 18:04:10 yngwin Exp $
 
 EAPI="2"
 inherit eutils
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="qt4 debug"
 
-RDEPEND="qt4? ( =x11-libs/qt-4.4*[opengl]
+RDEPEND="qt4? ( x11-libs/qt-gui:4
+		x11-libs/qt-opengl:4
 		virtual/glut )"
 DEPEND=">=dev-util/acgmake-1.4
 	>=sys-apps/findutils-4.3.0