Cleaned and fixed a few minor QA issues

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

4 files changed, 31 insertions, 70 deletions

diff --git a/media-libs/qhull/ChangeLog b/media-libs/qhull/ChangeLog
index 96a4cad8f27a..c3eda0f3843c 100644
--- a/media-libs/qhull/ChangeLog
+++ b/media-libs/qhull/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/qhull
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.30 2009/05/17 13:01:46 nixnut Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.31 2009/09/09 20:47:51 bicatali Exp $
+
+  09 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> -qhull-2003.1.ebuild,
+  qhull-2003.1-r1.ebuild:
+  Cleaned and fixed a few minor QA issues
 
   17 May 2009; nixnut <nixnut@gentoo.org> qhull-2003.1-r1.ebuild:
   ppc stable #245707
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index d153b3e3f955..71c7617830b3 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,9 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qhull-2003.1-makefile.patch 2105 RMD160 7f5d07d24c391660321e8a16ff80e1943f130337 SHA1 a871c5bf98c97e5f0f27e23175db7c9b4ad459c6 SHA256 a3003fdd083bf47c04b3ac346b3f64888fcf947f0141db00e01a382bccf54e82
 AUX qhull-3.1-makefile.patch 2516 RMD160 539e9ca64a8fc8e7a8af9525c11cd3e2e09ea6f7 SHA1 016009629a0b174384a4f805d894bb0dd9e69d1e SHA256 5685cad5fb45b05444ebb6c2867974aad3391a9936070f976a5b58aeb52c27a7
 DIST qhull-2003.1.tar.gz 724313 RMD160 6c82ad27601f9aa12498e3bc08f06c7b777a5f4d SHA1 2e783b5e45cecc053b1dc08c682b871dfbb59dd2 SHA256 68725c96603a426da748d38d0f83e7a9dd6a0bfc483525debe04001846475b0b
 DIST qhull3.1.tgz 442679 RMD160 11cad251d238725589fa0ec454caf714a98e3840 SHA1 598a297105199efd69799941acf154f69adc0607 SHA256 c4bf2035b2bdc86094b244fbe5a9ae0df9fdc2af4d96a4d0ba93a7060af2b30e
-EBUILD qhull-2003.1-r1.ebuild 886 RMD160 73f0b8021d76b9200514a3436c8c5d244388d593 SHA1 2ea570e748bf40f67d13396d55cf2305ffd05e6e SHA256 d01335a5f866d7df4abda21b75e5474224ca249097cd1c026089d3b9363201a1
-EBUILD qhull-2003.1.ebuild 1151 RMD160 20e8c4abbe7e49120c25fc19dbe4a66114a04c85 SHA1 0f3442cf3e4d714e513eba0380a168e65e26b97a SHA256 8505097907e79bb2472b2546b4655985f66c5c6c6fcd5c6ec72a855a3071bb35
+EBUILD qhull-2003.1-r1.ebuild 851 RMD160 d770fc8d7313cdf87b2167c9117bf670d457cdd1 SHA1 15728261b624e06e703ab1d25a19a65aeed37693 SHA256 353b4b3aee018a143f51f7bb8f13ae96bc21da050c130991449af3deb328370c
 EBUILD qhull-3.1-r1.ebuild 1191 RMD160 1494c269e3424746e8aa0234e8b10227a1f25670 SHA1 8f42c73d133e7f7fbc686ace08f7685216f53507 SHA256 d7847372780fc6d95888bd7d8dea32aabe6190fdbc7aeeb0400636349a9d3481
-MISC ChangeLog 4297 RMD160 dd0b920eedec5607fa2fa9074b0d540220552b32 SHA1 3ddbd71a49f4ccb4241f57e2521af31403b8160d SHA256 8cf7a8696ece723cb6a889fcf57710cae466d05780cf2f4f2509f0a0cf486ffd
+MISC ChangeLog 4445 RMD160 9459816c0b5a7eeb577b9d1cf6b8e450651b5e8d SHA1 12b5bf7e32661b98635217cfd3bd67e6d14d8452 SHA256 9e8304a1263bd4a5be982f40a34f1a74b730ebb519e074e8ed543f8251213341
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqoFIgACgkQ1ycZbhPLE2AbsACfdxobyvlNWBdBdi0L4ZmNBpFV
+cdkAnjcs2e8PPqBBZPm+L1UUO0CW6p6W
+=DIck
+-----END PGP SIGNATURE-----
diff --git a/media-libs/qhull/qhull-2003.1-r1.ebuild b/media-libs/qhull/qhull-2003.1-r1.ebuild
index 5997c0df102b..2a76b0a51e8e 100644
--- a/media-libs/qhull/qhull-2003.1-r1.ebuild
+++ b/media-libs/qhull/qhull-2003.1-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2003.1-r1.ebuild,v 1.7 2009/05/17 13:01:46 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2003.1-r1.ebuild,v 1.8 2009/09/09 20:47:51 bicatali Exp $
 
+EAPI=2
 inherit eutils flag-o-matic
 
 MY_P="${PN}${PV}"
@@ -12,25 +13,23 @@ SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="alpha amd64 ~hppa ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+IUSE="doc"
 
-src_compile() {
+pkg_setup() {
 	# anything beyond -O1 leads to bad code in libqhull on amd64
 	# with gcc-4.2
-	if [[ "${ARCH}" == "amd64" ]]; then
-		replace-flags -O? -O1
-	fi
-
-	econf || die "econf failed"
-	emake || die "emake failed"
+	#use amd64 && replace-flags -O? -O1
+	echo
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	rm -fr "${D}"/usr/share/doc/${PN}
-	dodoc Announce.txt .txt File_id.diz README.txt REGISTER.txt
-	cd html
-	dohtml *
-	dodoc *.txt
+	dodoc Announce.txt File_id.diz README.txt REGISTER.txt
+	if use doc; then
+		cd html
+		dohtml * || die
+		dodoc *.txt || die
+	fi
 }
diff --git a/media-libs/qhull/qhull-2003.1.ebuild b/media-libs/qhull/qhull-2003.1.ebuild
deleted file mode 100644
index 70b2308bb588..000000000000
--- a/media-libs/qhull/qhull-2003.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2003.1.ebuild,v 1.2 2007/11/18 13:15:43 markusle Exp $
-
-inherit eutils
-
-MY_P="${PN}${PV}"
-DESCRIPTION="Geometry library"
-HOMEPAGE="http://www.qhull.org"
-SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/src
-	mv Makefile.txt Makefile
-	# Replaced sed/echo hacks by a clean patch. Fix build error on -fPIC archs
-	# BUG #82646
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/02/22
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	cd src
-	emake CCOPTS1="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	cd src
-
-	dolib libqhull.a || die "dolib failed"
-	dolib.so libqhull.so || die "dolib.so failed"
-	dobin qconvex qdelaunay qhalf qhull qvoronoi rbox || die "dobin failed"
-
-	insinto /usr/include/qhull
-	doins *.h
-
-	cd "${S}"
-	dodoc Announce.txt COPYING.txt File_id.diz README.txt REGISTER.txt
-	cd html
-	dohtml *
-	dodoc *.txt
-	for m in *man
-	do
-		newman ${m} ${m/.man/.1}
-	done
-}