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

(Portage version: 2.2.01.18252-prefix/cvs/Interix x86)

4 files changed, 32 insertions, 60 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/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() {