Cleanup repoman warnings and old versions. Fix openmesh-1.{0.0,9.5} to work with newer acgmake.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64

6 files changed, 40 insertions, 92 deletions

diff --git a/media-gfx/openmesh/ChangeLog b/media-gfx/openmesh/ChangeLog
index c32d01957888..2ed69ff9873a 100644
--- a/media-gfx/openmesh/ChangeLog
+++ b/media-gfx/openmesh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/openmesh
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.10 2008/12/04 02:09:10 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.11 2008/12/18 03:14:08 jsbronder Exp $
+
+  18 Dec 2008; Justin Bronder <jsbronder@gentoo.org> openmesh-1.0.0.ebuild,
+  openmesh-1.9.5.ebuild, -openmesh-1.9.6.ebuild, openmesh-1.9.6-r1.ebuild:
+  Cleanup repoman warnings and old versions. Fix openmesh-1.{0.0,9.5} to work
+  with newer acgmake.
 
 *openmesh-1.9.6-r1 (04 Dec 2008)
 
diff --git a/media-gfx/openmesh/Manifest b/media-gfx/openmesh/Manifest
index 4f9db7c00127..3ff34eab3a60 100644
--- a/media-gfx/openmesh/Manifest
+++ b/media-gfx/openmesh/Manifest
@@ -5,16 +5,15 @@ AUX openmesh-1.0.0-gcc41.patch 3925 RMD160 ab4ed625667063776307d04c3a0fc5107459c
 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 1467 RMD160 8bed484b6ec09175ab30fcd14d988ea25c01006f SHA1 97c898147eea4658414afb3ef4be8e6f162c7e85 SHA256 6d0879bced4097100bc9749cb825bb817d89c08f304f3363fd110ab2db97fae5
-EBUILD openmesh-1.9.5.ebuild 1464 RMD160 9d7b29ad2b940c15fa1461c869b1f738ec0e2143 SHA1 f7e741ca68a0f5c53016e163cbfcf1ec520f4439 SHA256 6764bc4ba9ee2250f82e90284f56c9acad2076c02d8c08d3c4e141693c53c90c
-EBUILD openmesh-1.9.6-r1.ebuild 1454 RMD160 801742c8d1eef1946aa55e83937af96b2bd6d3c9 SHA1 b6385e578ca527775788d38d657b1327a8d61d41 SHA256 1cfe325e8074c1772f85db1db0f935ae4672ddd183e118b2a7986b042abc995e
-EBUILD openmesh-1.9.6.ebuild 1462 RMD160 6fe0f3eb3c711aa7d30b4c0ec3980fce1a8fe27b SHA1 72ba780b12a6121c2a78ad1ee5ecd73c40074e3f SHA256 7c8452e5f4e971a7b94825bf700ad3861a90f0540724de1765769556ff98a82b
-MISC ChangeLog 1818 RMD160 fcdd70b5dd2d15d0c80568f61fd5cb0480384d8d SHA1 f4050782c002de7873fe482aad7d3e5014a401ba SHA256 51d37d02c2463887a88033f78503df33c661984d7b98efedc01a9fd6eb2685ac
+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
+MISC ChangeLog 2070 RMD160 614f81ec68a2f2f2ee52286750928f4b5b82521f SHA1 3f1818c90e5957c079832810c61386a079e302f5 SHA256 7257bbf1daf9349537d880a5f2ca593e622bcbcc1643125b7c8ab808e4ae1b52
 MISC metadata.xml 720 RMD160 63cd57c75c7dff62a72fd8232e1f3b1ce5c1ac38 SHA1 c93c3c8d79018623f8ebb70a60be1e40ba38a2df SHA256 68ba8265b818feed768b7c6889a7136e261a92ab36b284ccc3d916bb51d01bad
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk3O8sACgkQ4MrvBE1wQ8ll9ACdGWhvsog6oL64v+VsUHECUdfk
-oxAAn3zXT9b5wFS3grV6TfgOim8dWwGB
-=1DUg
+iEYEARECAAYFAklJwA8ACgkQ4MrvBE1wQ8nbUwCfXK/KImsJIKvrRn3mcHuIllPw
+H3AAoLGeMVKG4Ss9JufJfOTFXJUWeMNV
+=D3A2
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/openmesh/openmesh-1.0.0.ebuild b/media-gfx/openmesh/openmesh-1.0.0.ebuild
index 48eb32605964..1bab63ca58de 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
 # 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.4 2008/08/11 23:40:23 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.0.0.ebuild,v 1.5 2008/12/18 03:14:08 jsbronder Exp $
 
 EAPI="1"
 inherit eutils
@@ -23,9 +23,9 @@ DEPEND="dev-util/acgmake
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-gcc41.patch || die
+	epatch "${FILESDIR}"/${P}-gcc41.patch || die
 
 	if ! use qt4
 	then
@@ -40,14 +40,15 @@ src_compile() {
 	acgmake ${myconf} || die
 
 	# fix insecure runpaths
-	TMPDIR=${S} scanelf -BXRr ${S} -o /dev/null || die
+	TMPDIR=${S} scanelf -BXRr "${S}" -o /dev/null || die
 }
 
 src_install() {
-	into /usr
-	dolib Core/Linux_gcc_dbg/libOpenMesh_Core.so
-	dolib Tools/Linux_gcc_dbg/libOpenMesh_Tools.so
-	dolib Tools/Subdivider/Adaptive/Composite/Linux_gcc_dbg/libOpenMesh_Tools_Subdivider_Adaptive_Composite.so
+	local l
+
+	for l in $(find "${S}"/{Core,Tools} -name '*.so'); do
+		dolib ${l} || die
+	done
 
 	make clean
 
@@ -56,7 +57,6 @@ src_install() {
 
 	dodir /usr/include/${MY_PN}
 
-	cp -a Core ${D}/usr/include/${MY_PN}
-	cp -a Tools ${D}/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.5.ebuild b/media-gfx/openmesh/openmesh-1.9.5.ebuild
index ea4552c411ec..6079df6f103d 100644
--- a/media-gfx/openmesh/openmesh-1.9.5.ebuild
+++ b/media-gfx/openmesh/openmesh-1.9.5.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2008/08/11 23:40:23 yngwin Exp $
+# $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
@@ -24,7 +24,7 @@ DEPEND=">=dev-util/acgmake-1.2-r2
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	use qt4 || sed -i "s:Apps::" ACGMakefile
 }
@@ -38,22 +38,24 @@ src_compile() {
 	acgmake -env || die
 
 	# fix insecure runpaths
-	TMPDIR=${S} scanelf -BXRr ${S} -o /dev/null || die
+	TMPDIR="${S}" scanelf -BXRr "${S}" -o /dev/null || die
 }
 
 src_install() {
-	into /usr
-	dolib Core/Linux_gcc_env/libOpenMesh_Core.so
-	dolib Tools/Linux_gcc_env/libOpenMesh_Tools.so
-	dolib Tools/Subdivider/Adaptive/Composite/Linux_gcc_env/libOpenMesh_Tools_Subdivider_Adaptive_Composite.so
+	local l
+
+	for l in $(find "${S}"/{Core,Tools} -name '*.so'); do
+		dolib ${l} || die
+	done
 
 	make clean
 
-	find . -name 'ACGMakefile' -delete
-	find . -name '*.vcproj' -delete
+	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}
+	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
index 00b29bd65c7e..941112255fc5 100644
--- a/media-gfx/openmesh/openmesh-1.9.6-r1.ebuild
+++ b/media-gfx/openmesh/openmesh-1.9.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2008/12/04 02:09:10 jsbronder Exp $
+# $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
@@ -36,14 +36,14 @@ src_compile() {
 	acgmake -env || die
 
 	# fix insecure runpaths
-	TMPDIR=${S} scanelf -BXRr "${S}" -o /dev/null || die
+	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}
+		dolib ${l} || die
 	done
 
 	# Clean up manually as acgmake doesn't do a decent job.
diff --git a/media-gfx/openmesh/openmesh-1.9.6.ebuild b/media-gfx/openmesh/openmesh-1.9.6.ebuild
deleted file mode 100644
index d353181a9f79..000000000000
--- a/media-gfx/openmesh/openmesh-1.9.6.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.ebuild,v 1.1 2008/11/25 21:19:52 jsbronder Exp $
-
-EAPI="1"
-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* ) )"
-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() {
-	into /usr
-	dolib Core/Linux_gcc_env/libOpenMesh_Core.so
-	dolib Tols/Linux_gcc_env/libOpenMesh_Tools.so
-	dolib Tools/Subdivider/Adaptive/Composite/Linux_gcc_env/libOpenMesh_Tools_Subdivider_Adaptive_Composite.so
-
-	make clean
-
-	find . -name 'ACGMakefile' -delete
-	find . -name '*.vcproj' -delete
-
-	dodir /usr/include/${MY_PN}
-
-	cp -a Core "${D}"/usr/include/${MY_PN}
-	cp -a Tools "${D}"/usr/include/${MY_PN}
-}