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

(Portage version: 2.2_rc33/cvs/Linux x86_64)

5 files changed, 12 insertions, 125 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/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