QA: Respect CC (bug 243738), respect CFLAGS (bug 240139), fix test suite

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 40 insertions, 10 deletions

diff --git a/app-text/mpage/Manifest b/app-text/mpage/Manifest
index 2103a633900f..d61b4f413812 100644
--- a/app-text/mpage/Manifest
+++ b/app-text/mpage/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mpage-2.5.4-gcc4.patch 836 RMD160 a45ce0c152728451104aab6e906a3e3d569106d5 SHA1 5caff464923d99f6c04db28b50eb203fc7f874f2 SHA256 d6c80fc4ca9b1b1c165a0fcbf190dea499f5439dda91ca7f4584ef1c1c48b91f
 DIST mpage-2.5.4.tgz 93992 RMD160 87c58c4d243efe5790c0240b17130382e705fadc SHA1 5e734f8e4d5992fa79e358653c9f72a59fc530b2 SHA256 c5487b9e5e72da60808272ed4c3de50f9237f3c9f30dfd9000520af6fbfc9a8e
-EBUILD mpage-2.5.4.ebuild 815 RMD160 0d0119fcec834f1c09b6773dc55007ddb834eb90 SHA1 f6280b034584532b251d6afc2d4eb3045fabeac6 SHA256 68bf0852eb1eb4422afcd8033fee4c2098dd5860b4294a1f0c8323e02708f19f
-MISC ChangeLog 2601 RMD160 cd8b17372849effec574fea1393295ac767bbaa1 SHA1 c24720e759bc2cd1f1bd97b4864b0584a01e6686 SHA256 ef2285078e14c4859c4c473cbd1cbe45fd657f5bf030c31aa88995f013599c06
+EBUILD mpage-2.5.4.ebuild 856 RMD160 87af575821aa00d0bd06940dfdf5a6142257e214 SHA1 729ebd2d9a7fe4f3eba31c2e6f481a4305897a0e SHA256 1449db10303c603d1aac723454ae87203349c417a6e42ccf51ba8617225681f2
+MISC ChangeLog 2702 RMD160 ab028b112b3e004cc4602e99afae28e37f7f0852 SHA1 536f941def2474eae4dd353939d690b17125c14a SHA256 2564b3a51f33db700a4be08c883691ad81a8d66c9dfd1e91ac7c5d5fd8c4ad18
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklalR0ACgkQKhnDs22gwa/GOQCfcfICAXSdBshPKt5DygN6/cIx
+iKEAnA2drycjjvQhdVukqrwhvGGspP7g
+=lLYR
+-----END PGP SIGNATURE-----
diff --git a/app-text/o3read/ChangeLog b/app-text/o3read/ChangeLog
index 4c7daa04b7e3..d2d59f044fd2 100644
--- a/app-text/o3read/ChangeLog
+++ b/app-text/o3read/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/o3read
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/o3read/ChangeLog,v 1.14 2008/10/18 15:06:48 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/o3read/ChangeLog,v 1.15 2008/12/30 21:36:23 angelos Exp $
+
+  30 Dec 2008; Christoph Mende <angelos@gentoo.org> o3read-0.0.4.ebuild:
+  QA: Respect CC (bug 243738), respect CFLAGS (bug 240139), fix test suite
 
   18 Oct 2008; nixnut <nixnut@gentoo.org> o3read-0.0.4.ebuild:
   Stable on ppc wrt bug 233424
diff --git a/app-text/o3read/Manifest b/app-text/o3read/Manifest
index 5abc4e5f8442..e1e6ea30a919 100644
--- a/app-text/o3read/Manifest
+++ b/app-text/o3read/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST o3read-0.0.4.tar.gz 21075 RMD160 c011a283fdc3ee6ff4c340519a4ef7f32c258f38 SHA1 aa8bcfc82b5327f3d86a35193c0a434e33107d09 SHA256 3704b448099d3396bec4cf503c298628c815703aae12bfcddbac4444bc786430
-EBUILD o3read-0.0.4.ebuild 591 RMD160 611324c3843282d9fe0252deccb4032dbb4f4aec SHA1 81e92fba8af4aba4588cdd8d65ac3f1606a62ae6 SHA256 90ed72f35a36d5bb7961e37205728788ffe2fe8cb016fcc0c4828076924bb5ec
-MISC ChangeLog 1490 RMD160 15f3f80dbe4085ecaad42a7aa134fda963341666 SHA1 f36a7ca3222d64c28b4d3289583eaf412630bc72 SHA256 b3dd0162c431d7931477a025cdb53537de26a68183475dba8992c2de823338b1
+EBUILD o3read-0.0.4.ebuild 756 RMD160 bbefd6ab525e266ec095fde1a246f64075b9a607 SHA1 dcf7e2100f03ee3843a05bec5c26fab370b8ed98 SHA256 e0ebd9929488d1769ba8aa6866acc51b233ea10eb69b1ac41d6b78afaea07a0e
+MISC ChangeLog 1640 RMD160 e7c0bfd2581927c595584d02bc5db2701df59dcd SHA1 278cec90618d4678c2de7837a190f133f77316ef SHA256 ae4b245889083c6af69258b92ef78f1faf162169edca6e83ec2b2e1b19a71c70
 MISC metadata.xml 234 RMD160 eba4806545de0d7dfd954fe889ac8e82f7be1484 SHA1 03dd609a4efde867c4b12eaae5eb5cc44f7ebd53 SHA256 5085e7eb7655a7c639d97404f04d8732cbf17e72688a61ecd2e0967ac2a5711d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklalF4ACgkQKhnDs22gwa9FUwCgz8rZ0YcUVlCTWdtayk1rNVxm
+IR0AnRuK2ExbQQWgjdVLdaJa+KfOw6qS
+=s18O
+-----END PGP SIGNATURE-----
diff --git a/app-text/o3read/o3read-0.0.4.ebuild b/app-text/o3read/o3read-0.0.4.ebuild
index 096d41ddf558..e42069c5f143 100644
--- a/app-text/o3read/o3read-0.0.4.ebuild
+++ b/app-text/o3read/o3read-0.0.4.ebuild
@@ -1,23 +1,30 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/o3read/o3read-0.0.4.ebuild,v 1.7 2008/10/18 15:06:48 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/o3read/o3read-0.0.4.ebuild,v 1.8 2008/12/30 21:36:23 angelos Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="Converts OpenOffice formats to text or HTML."
 HOMEPAGE="http://siag.nu/o3read/"
-SRC_URI="http://siag.nu/pub/o3read/${P}.tar.gz"
+SRC_URI="http://siag.nu/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
+IUSE="test"
 
-DEPEND="app-arch/unzip"
+DEPEND="test? ( app-arch/unzip
+	www-client/lynx )"
 
 src_compile() {
-	emake || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
 	dobin o3read o3totxt o3tohtml utf8tolatin1
 	doman o3read.1 o3tohtml.1 o3totxt.1 utf8tolatin1.1
 }
+
+src_test() {
+	emake lytest || die "make lytest failed"
+}