add new version with interix5 specific fixes. update live ebuild, remove old versions.

Package-Manager: portage-2.2.01.18252-prefix/cvs/Interix x86

5 files changed, 36 insertions, 66 deletions

diff --git a/sys-libs/suacomp/ChangeLog b/sys-libs/suacomp/ChangeLog
index 86cf651b06de..c4b8d003254c 100644
--- a/sys-libs/suacomp/ChangeLog
+++ b/sys-libs/suacomp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/suacomp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/suacomp/ChangeLog,v 1.5 2011/05/20 10:54:01 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/suacomp/ChangeLog,v 1.6 2011/05/23 14:54:47 mduft Exp $
+
+*suacomp-0.6.9 (23 May 2011)
+
+  23 May 2011; Markus Duft <mduft@gentoo.org> -suacomp-0.6.5.ebuild,
+  -suacomp-0.6.6.ebuild, +suacomp-0.6.9.ebuild, suacomp-9999.ebuild:
+  add new version with interix5 specific fixes. update live ebuild, remove old
+  versions.
 
 *suacomp-9999 (20 May 2011)
 *suacomp-0.6.8 (20 May 2011)
diff --git a/sys-libs/suacomp/Manifest b/sys-libs/suacomp/Manifest
index 15fb661a06fe..86a7807f6e97 100644
--- a/sys-libs/suacomp/Manifest
+++ b/sys-libs/suacomp/Manifest
@@ -1,11 +1,9 @@
-DIST suacomp-0.6.5.tar.gz 23154 RMD160 ab62935417217400c9733b9807c3875eff2f2695 SHA1 9e88a5191b30b611376e2fa23cd751d803bfc15a SHA256 3af28b25efbd1575cadd1497226950b3cd174c0d9eedbc6f76e80874b48e981f
-DIST suacomp-0.6.6.tar.gz 26248 RMD160 d25f6bbf66b23c9e243caa9b6b5f30fc0fe834ae SHA1 27c394fd24aafeafa0d325a1aae02f93fdcb48a2 SHA256 fb82c3b9c392800e2cc303362218315b0b3b2a0855517602bf75d6b890503724
 DIST suacomp-0.6.7.tar.gz 27584 RMD160 85db385f63f17d00cb7a5ac23b9c8790ad5180c4 SHA1 b45b606b4da9d49934a5b7e269d1050019941e76 SHA256 53cc4cb2d1a31935c95323c9d756e628ee4bfd2ae5f92646a1eb8ac3bb982f0e
 DIST suacomp-0.6.8.tar.gz 31619 RMD160 06fe3b87055563e629146ad65fe38af6f4b601c9 SHA1 09b90b3c7e3b5594c993b1194bd8b8c42163699c SHA256 9d2f7279e8e166e53a2d3a6e2d8637eb4ce375fc83dabca8c0601d05ac3c6e51
-EBUILD suacomp-0.6.5.ebuild 1129 RMD160 bf5537f3f499615e66ebbaaa6aa29dabe97b1acd SHA1 d54ffbe5fd702d0700c907ff83e2601a7fa7f5b2 SHA256 2cd83456fef6f0efd8f1f42b3fce7fc434983afdbaadfb24fd87921f5e3feb54
-EBUILD suacomp-0.6.6.ebuild 1215 RMD160 8cefcde1f42d9826469c52ec615c3a35d15e7669 SHA1 083b54b00f2f7bcbd59f37fff94791e764fb6f91 SHA256 80ec31c7661fe712e7d7a4b4b8624921a07e37ee22005e25ba5595e53595a5da
+DIST suacomp-0.6.9.tar.gz 31859 RMD160 c930ab2a5ca03cf550742fdaf9aeef43a15b490d SHA1 297ef4be689ca7fe4ef5d4f7ff97d2e5b4b501a3 SHA256 9e3cb4593ff99cc84fb0c1e1c314cba19feb91eb3dbe50907b1c947c9550b8b8
 EBUILD suacomp-0.6.7.ebuild 1215 RMD160 0fd9a476ef9a1bde566f1ecb36a21c602e93fc70 SHA1 4303ec28501756e37a8eb22e64969927857cdc62 SHA256 0ff312635f374e2b1782525b71955f0260ac6b16e7baffd6fae1b7f3efe00eb6
 EBUILD suacomp-0.6.8.ebuild 1405 RMD160 b7233b297e8cc3f6791bdacac344a7b47cf0b6fc SHA1 6799c754b8614256976fddb5552b70e87e5042e3 SHA256 4f382f32217df63658f111d83d356c89551bf8d3756b381ee699cee728c688f7
-EBUILD suacomp-9999.ebuild 1399 RMD160 f91bdca9ee141e94dec3631ba2b042127b3aabd7 SHA1 ffca7042750c45418ecefebb67d9bc6b508201cc SHA256 6fab741ec40115db550d2a7355e24c45644b8f534a24fd1c8937f68fcefb9aa9
-MISC ChangeLog 981 RMD160 ee3c0171148c64351f3166ae7caec89207079126 SHA1 0eb0a1af0bfa9d763ca83ebf027df6b381560b05 SHA256 0e25f2a0bcb7c123030e0c3192f27fe0368a13f92af9ce44cf6bebf51131e4c7
+EBUILD suacomp-0.6.9.ebuild 1463 RMD160 79aa21d02877c97576ba26c95a64af48e925b98b SHA1 1b2a3b4feca5d76a3583c717ea4ed2b1fca2c064 SHA256 a3ac4f767ff9c292167960053a20f3964a5842c6bc31df7a37b73245a553cb56
+EBUILD suacomp-9999.ebuild 1457 RMD160 bf5aa2ceb36306df050ecc1c4d92a3384c64eebe SHA1 6dbe5d23399eadb35ca4f39a7873082f6be618fc SHA256 19b496967ec6e7d3c6182279aac0505b16e3869fa54a929182640a661fcc5a93
+MISC ChangeLog 1241 RMD160 f6be293f9b6d0a20ebf5b2153abe4bb17721486b SHA1 5ae71e196b339fa2c32125452b328a2a4d855954 SHA256 9e4aaf8b286fbbcd4ac9b29bcff33f2a325ee797db1f22e4acee22ace869182f
 MISC metadata.xml 463 RMD160 8d5a39c8c367b923a1ffa3d54cb7573a0dff3d61 SHA1 035dd048b0f1bbe16174cfdd92949914a451e709 SHA256 48ff68dfa4b39d46068d853d57bdb4a35ef6304368397fcb45105f3a4798e2ca
diff --git a/sys-libs/suacomp/suacomp-0.6.6.ebuild b/sys-libs/suacomp/suacomp-0.6.6.ebuild
deleted file mode 100644
index e0ad37dd488a..000000000000
--- a/sys-libs/suacomp/suacomp-0.6.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/suacomp/suacomp-0.6.6.ebuild,v 1.1 2010/11/04 15:12:43 mduft Exp $
-
-EAPI=3
-
-inherit toolchain-funcs
-
-DESCRIPTION="library wrapping the interix lib-c to make it less buggy."
-HOMEPAGE="http://suacomp.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BEER-WARE"
-SLOT="0"
-KEYWORDS="-* ~x86-interix"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-get_opts() {
-	local shlibc=
-	local stlibc=
-
-	for dir in /usr/lib /usr/lib/x86; do
-		[[ -f ${dir}/libc.a ]] && stlibc=${dir}/libc.a
-
-		for name in libc.so.5.2 libc.so.3.5; do
-			[[ -f ${dir}/${name} ]] && { shlibc=${dir}/${name}; break; }
-		done
-
-		[[ -f ${shlibc} && -f ${stlibc} ]] && break
-	done
-
-	echo "SHARED_LIBC=${shlibc} STATIC_LIBC=${stlibc}"
-}
-
-src_compile() {
-	local mycflags=
-	[[ ${CHOST} == *-interix3* ]] && mycflags="-DINTERIX3"
-
-	emake all CC=$(tc-getCC) CFLAGS="${CFLAGS} ${mycflags}" $(get_opts) || die "emake failed"
-}
-
-src_install() {
-	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) || die "emake install failed"
-}
-
-src_test() {
-	emake check $(get_opts) || die "emake check failed"
-}
diff --git a/sys-libs/suacomp/suacomp-0.6.5.ebuild b/sys-libs/suacomp/suacomp-0.6.9.ebuild
index 51d623fa9f8a..600ba3579590 100644
--- a/sys-libs/suacomp/suacomp-0.6.5.ebuild
+++ b/sys-libs/suacomp/suacomp-0.6.9.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/suacomp/suacomp-0.6.5.ebuild,v 1.2 2010/11/04 15:12:43 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/suacomp/suacomp-0.6.9.ebuild,v 1.1 2011/05/23 14:54:47 mduft Exp $
 
 EAPI=3
 
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="library wrapping the interix lib-c to make it less buggy."
 HOMEPAGE="http://suacomp.sf.net"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BEER-WARE"
 SLOT="0"
 KEYWORDS="-* ~x86-interix"
-IUSE=""
+IUSE="debug"
 
 DEPEND=""
 RDEPEND=""
@@ -35,14 +35,29 @@ get_opts() {
 	echo "SHARED_LIBC=${shlibc} STATIC_LIBC=${stlibc}"
 }
 
+pkg_setup() {
+	if use debug; then
+		append-flags -D_DEBUG -D_DEBUG_TRACE
+	fi
+
+	[[ ${CHOST} == *-interix3* ]] && append-flags -DINTERIX3
+	[[ ${CHOST} == *-interix5* ]] && append-flags -DINTERIX5
+}
+
 src_compile() {
-	emake all CC=$(tc-getCC) CFLAGS="${CFLAGS}" $(get_opts) || die "emake failed"
+	emake all CC=$(tc-getCC) $(get_opts) CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) || die "emake install failed"
+	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) \
+		CFLAGS="${CFLAGS}" || die "emake install failed"
 }
 
 src_test() {
-	emake check $(get_opts) || die "emake check failed"
+	local v=
+
+	use debug && v="TEST_VERBOSE=1"
+	use debug && export SUACOMP_DEBUG_OUT=stderr
+
+	emake check $(get_opts) ${v} || die "emake check failed"
 }
diff --git a/sys-libs/suacomp/suacomp-9999.ebuild b/sys-libs/suacomp/suacomp-9999.ebuild
index 0146c87bb138..e64dbad75a9e 100644
--- a/sys-libs/suacomp/suacomp-9999.ebuild
+++ b/sys-libs/suacomp/suacomp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/suacomp/suacomp-9999.ebuild,v 1.1 2011/05/20 10:54:01 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/suacomp/suacomp-9999.ebuild,v 1.2 2011/05/23 14:54:47 mduft Exp $
 
 EAPI=3
 
@@ -41,6 +41,7 @@ pkg_setup() {
 	fi
 
 	[[ ${CHOST} == *-interix3* ]] && append-flags -DINTERIX3
+	[[ ${CHOST} == *-interix5* ]] && append-flags -DINTERIX5
 }
 
 src_compile() {