Version bump. This also fixes bug #289110. Remove old.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

7 files changed, 26 insertions, 214 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 8a2c5ca19d6d..72861ac20ed8 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.259 2010/05/16 17:32:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.260 2010/05/18 18:59:25 billie Exp $
+
+*cdrtools-2.01.01_alpha79 (18 May 2010)
+
+  18 May 2010; Daniel Pielmeier <billie@gentoo.org>
+  -cdrtools-2.01.01_alpha57-r1.ebuild, -cdrtools-2.01.01_alpha77.ebuild,
+  +cdrtools-2.01.01_alpha79.ebuild,
+  -files/cdrtools-2.01.01_alpha34-asneeded.patch,
+  -files/cdrtools-2.01.01_alpha50-asneeded.patch,
+  -files/cdrtools-2.01.01a03-warnings.patch:
+  Version bump. This also fixes bug #289110. Remove old.
 
   16 May 2010; Raúl Porcel <armin76@gentoo.org>
   cdrtools-2.01.01_alpha75.ebuild:
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 4df9eecbfb47..d6efdf5488dd 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,13 +1,8 @@
-AUX cdrtools-2.01.01_alpha34-asneeded.patch 1407 RMD160 1d7f740ae9c895c0afa75115642676a515d79403 SHA1 6afe7907a408ef26b917f805ca2327edb976d672 SHA256 9cdfe85219c500541f126108be6ae5b0bfd15e8d8fb90b34dbdff3d9baadcee1
-AUX cdrtools-2.01.01_alpha50-asneeded.patch 951 RMD160 e7b90692b14a350f78cd33981449d10bd8df76d1 SHA1 3a014efb3e23f5ab474be7d8e10f8d2782f6ea23 SHA256 f3e5dc8a4ad165848da1776ce949940f3b91378a7b5a54a8d7808014dffc921d
-AUX cdrtools-2.01.01a03-warnings.patch 853 RMD160 5ecadc359bfe6d914f2782b7ea8e7b0bb60e5c14 SHA1 35df7d6adeb1380d72c07fecdf65725b7e708fac SHA256 0d2ca432a854792c82ee89fe6a097c6b3c1621e38fcb6d16c7f88658e62a130d
-DIST cdrtools-2.01.01a57.tar.bz2 1779673 RMD160 d7e8ea512a1e8ecaf3be6a9c4a782ff16c1d5253 SHA1 e07ec85d42df24ecf5f15236bb0cc4968be47f98 SHA256 d393863ecbb595eb389360fedcf63f51e7897168175cd219b0dfd1ef3ac2ad35
 DIST cdrtools-2.01.01a75.tar.bz2 1922616 RMD160 784e6ffda7082f9a1f25c67647a148271445ab40 SHA1 eaef1c4b20763301e1c10139ad51923bb161de3e SHA256 49c84695ab01c4b34df7405bcdadb64b244dcccac7908dbcb97972f623ba23fe
-DIST cdrtools-2.01.01a77.tar.bz2 1925222 RMD160 0fee3b8c9fab0462f9fd7dd4ed965a013c8f82e0 SHA1 ac15fefd0089e6125e5bf6198b222522ba94e8f5 SHA256 c007e72ec113503a30f26f7b344d95f804a72ff4981141e2a55fc2b32db324cc
 DIST cdrtools-2.01.01a78.tar.bz2 1928976 RMD160 8fcaf22c1032e1cc88426804530ee6f971b6625e SHA1 39643e00a37b1a2c38e6190675251b793ca97225 SHA256 7a7a2a56c5d8cd978bb12a78347c43595252b2808bacc17712853f17e3ed2e2c
-EBUILD cdrtools-2.01.01_alpha57-r1.ebuild 3741 RMD160 e33768607c3eb47dac4c0d0316404fcab34bad3e SHA1 3b34dde1f622724ba233b10a3b1d8947c11c2e45 SHA256 cc9c4ea9e7f580b91d4d6b19254a309bb8599d2ea1596a16a249101f6fd10943
+DIST cdrtools-2.01.01a79.tar.bz2 1946150 RMD160 250a5792fd07cadf76415b29e27ad93342158fc8 SHA1 8f78c45597894ce6cf413f0e8c59e5be9ba03217 SHA256 2129ea2bb7803ebaa02a567a52e788caabfa356f5f83fa11fb5f097b7edf7867
 EBUILD cdrtools-2.01.01_alpha75.ebuild 3908 RMD160 9e5761543a13be6f407571861c6a7c462afc6583 SHA1 e3919387490faeaaf06bbc710a1ee31ddc18f116 SHA256 1cca349320ee7e3bc3290357b71136d5f4368a4f0427ba2f44d7ea5f6e72f192
-EBUILD cdrtools-2.01.01_alpha77.ebuild 3875 RMD160 d204c3ac6c084115ae9d117dfec99419b174e018 SHA1 cf1ec90e44f86e9751a05a3db741f56f5e725b29 SHA256 af0515f4f2b9859e080127ef16f4a808a5ddfc35e6f66fc4105a46ea6b665d65
 EBUILD cdrtools-2.01.01_alpha78.ebuild 3875 RMD160 ec09b5946603df358b146c109bc9dc600097c813 SHA1 bac93beac90f9a25e588131dd74e3126a2e5d488 SHA256 ad8e92335dc9cc37fed0279d292f935d88f0a9440eccae1a5f2c519263b8e83d
-MISC ChangeLog 40564 RMD160 2489cc54805fc90200a38475111e5e29cf4167f0 SHA1 2a99179d25e015ddeebc45eeac76b372678a6bc5 SHA256 081f5bee7e90e2d8166def3b8847114dd70d0ba3f1991ed0458e9f8aa67cea3a
+EBUILD cdrtools-2.01.01_alpha79.ebuild 4042 RMD160 1595dc117ec6bf85cfe7416719e1834d0f0efe79 SHA1 75af31a10a1abad454ee0eabb22f734cf4127844 SHA256 9ef225be0032781e17c0bd5325677f2cb9efa63711908d286aadc8e72bc8498b
+MISC ChangeLog 40968 RMD160 bddb980922a0e6f81599fc910c3dd0f18dc2d00f SHA1 770ae86527ec91c8ac33687deca94b97bc485bc2 SHA256 f0ed48e612bcb0e8429fa8e089570596ca61ac5acb82c789e2d16b9d9e876813
 MISC metadata.xml 344 RMD160 a34ca9abb9d6e97a232f4b7d183e5350bbf2c978 SHA1 4f4dd69accee941e41b7d46e9038c50dce8e534f SHA256 1827502e9d2cfa583db6a17f065462b760bf3770fcac22a0145d6a560b2b34f8
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha57-r1.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha57-r1.ebuild
deleted file mode 100644
index 9940f0af483b..000000000000
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha57-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha57-r1.ebuild,v 1.8 2009/06/11 05:42:10 jer Exp $
-
-EAPI=2
-
-inherit multilib eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="http://cdrecord.berlios.de/"
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="unicode acl"
-
-DEPEND="acl? ( sys-apps/acl )
-	!app-cdr/dvdrtools
-	!app-cdr/cdrkit"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-2.01.01
-
-src_prepare() {
-	#"Adjust paths. Upstream is clearly on drugs, hardcoding paths into .c files.
-	sed -i -e 's:opt/schily:usr:' \
-		$(grep -l --include='*.1' --include='*.8' -r 'opt/schily' .) \
-		$(grep -l --include='*.c' --include='*.h' -r 'opt/schily' .) \
-		|| die "404 on opt-schily sed"
-
-	sed -i -e "s:\(^INSDIR=\t\tshare/doc/\):\1${PF}/:" \
-		$(grep -l -r 'INSDIR.\+doc' .) \
-		|| die "404 on doc sed"
-
-	# Upstream should be hanged from the yardarm, possibly keelhauled for
-	# not respecting libdir.
-	sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \
-		$(grep -l -r '^INSDIR.\+lib\(/siconv\)\?$' .) \
-		|| die "404 on multilib-sed"
-
-	# See previous comment s/libdir/--disable-static/
-	sed -i -e 's:include\t\t.*rules.lib::' \
-		$(grep -l -r '^include.\+rules\.lib' .) \
-		|| die "404 on rules sed"
-	#Remove profiled make files (wtf?)
-	rm -f $(find . -name '*_p.mk') || die "rm failed"
-
-	epatch "${FILESDIR}"/${PN}-2.01.01a03-warnings.patch
-	epatch "${FILESDIR}"/${PN}-2.01.01_alpha50-asneeded.patch
-
-	#Schily make setup
-	cd "${S}"/DEFAULTS
-	local MYARCH="linux"
-
-	sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH} || die "sed schily-opt failed"
-	sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH} || die "sed linux-include failed"
-	sed -i "/RUNPATH/ c\RUNPATH= " Defaults.${MYARCH} || die "sed RUNPATH failed"
-
-	# For dynamic linking:
-	sed -i "s:static:dynamic:" Defaults.${MYARCH} || die "sed static-remove failed"
-
-	# lame symlinks that all point to the same thing
-	cd "${S}"/RULES
-	local t
-	for t in ppc64 sh4 s390x ; do
-		ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die
-		ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die
-	done
-}
-
-src_configure() { : ; }
-
-src_compile() {
-	local ACL="-lacl"
-	if use unicode; then
-		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
-		if [[ -n ${flags} ]]; then
-			append-flags ${flags}
-		else
-			ewarn "Your compiler does not support the options required to build"
-			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
-		fi
-	fi
-
-	if ! use acl
-	then
-		CFLAGS="${CFLAGS} -DNO_ACL"
-		ACL=""
-	fi
-	#If not built with -j1, "sometimes" cdda2wav will not be built. Nasty bug.
-	emake -j1 CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" LIB_ACL_TEST="${ACL}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake -j1 MANDIR="share/man" INS_BASE="${D}/usr/" INS_RBASE="${D}" install
-
-	#These symlinks are for compat with cdrkit.
-	dosym schily /usr/include/scsilib
-	dosym ../scg /usr/include/schily/scg
-
-	dodoc ABOUT Changelog README README.linux-shm START READMEs/README.linux || die "dodoc cdrtools"
-
-	cd "${S}"/cdda2wav
-	docinto cdda2wav
-	dodoc FAQ Frontends HOWTOUSE TODO || die "dodoc cdda2wav"
-
-}
-
-pkg_postinst() {
-	echo
-	einfo "The command line option 'dev=/dev/hdX' (X is the name of your drive)"
-	einfo "should be used for IDE CD writers.  And make sure that the permissions"
-	einfo "on this device are set properly and your user is in the correct group."
-}
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha77.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha79.ebuild
index 09a3f1691d16..bc5d0a0b2c5c 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha77.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha79.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha77.ebuild,v 1.3 2010/04/27 20:27:26 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha79.ebuild,v 1.1 2010/05/18 18:59:25 billie Exp $
 
 EAPI=2
 
@@ -44,6 +44,7 @@ src_prepare() {
 		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
 		|| die "sed multilib"
 
+	# Do not install static libraries.
 	sed -i -e 's:include\t\t.*rules.lib::' \
 		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
 		|| die "sed rules"
@@ -74,7 +75,6 @@ src_prepare() {
 	sed -i \
 		-e "s:/opt/schily:/usr:g" \
 		-e "s:/usr/src/linux/include::g" \
-		-e "/RUNPATH/ c\RUNPATH= " \
 		-e "s:bin:root:g" \
 		Defaults.${os} || die "sed Schily make setup"
 }
@@ -96,16 +96,20 @@ src_compile() {
 		CFLAGS="${CFLAGS} -DNO_ACL"
 	fi
 
-	# If not built with -j1, "sometimes" cdda2wav will not be built. Bug?
+	# LIB_ACL_TEST removed to support x86-fbsd
+	# If not built with -j1, "sometimes" cdda2wav will not be built.
 	emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
-		LDOPTX="${LDFLAGS}" LINKMODE="dynamic" \
-		GMAKE_NOWARN="true" || die "emake"
+		LDOPTX="${LDFLAGS}" \
+		INS_BASE="${D}/usr" INS_RBASE="${D}" LINKMODE="dynamic" \
+		RUNPATH="" GMAKE_NOWARN="true" || die "emake"
 }
 
 src_install() {
-	# If not built with -j1, "sometimes" manpages are not installed. Bug?
-	emake -j1 INS_BASE="${D}/usr/" INS_RBASE="${D}" MANDIR="share/man" \
-		LINKMODE="dynamic" GMAKE_NOWARN="true" install || die "emake install"
+	# If not built with -j1, "sometimes" manpages are not installed.
+	emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
+		LDOPTX="${LDFLAGS}" \
+		INS_BASE="${D}/usr" INS_RBASE="${D}" LINKMODE="dynamic" \
+		RUNPATH="" GMAKE_NOWARN="true" install || die "emake install"
 
 	# These symlinks are for compat with cdrkit.
 	dosym schily /usr/include/scsilib || die "dosym scsilib"
diff --git a/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha34-asneeded.patch b/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha34-asneeded.patch
deleted file mode 100644
index 90fb1664ebaa..000000000000
--- a/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha34-asneeded.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur cdrtools-2.01.01.orig/libfind/libfind.mk cdrtools-2.01.01/libfind/libfind.mk
---- cdrtools-2.01.01.orig/libfind/libfind.mk	2007-02-04 01:00:05.000000000 +0200
-+++ cdrtools-2.01.01/libfind/libfind.mk	2007-08-28 22:33:25.000000000 +0300
-@@ -20,7 +20,7 @@
- CPPOPTS +=	-DSCHILY_PRINT
- 
- include		Targets
--LIBS=		
-+LIBS=		$(LIB_ACL)
- 
- ###########################################################################
- include		$(SRCROOT)/$(RULESDIR)/rules.lib
-diff -ur cdrtools-2.01.01.orig/libfind/libfind_p.mk cdrtools-2.01.01/libfind/libfind_p.mk
---- cdrtools-2.01.01.orig/libfind/libfind_p.mk	2007-06-30 14:13:34.000000000 +0300
-+++ cdrtools-2.01.01/libfind/libfind_p.mk	2007-08-28 22:34:04.000000000 +0300
-@@ -22,7 +22,7 @@
- CPPOPTS +=	-DSCHILY_PRINT
- 
- include		Targets
--LIBS=		
-+LIBS=		$(LIB_ACL)
- 
- ###########################################################################
- include		$(SRCROOT)/$(RULESDIR)/rules.lib
-diff -ur cdrtools-2.01.01.orig/libfind/shlfind.mk cdrtools-2.01.01/libfind/shlfind.mk
---- cdrtools-2.01.01.orig/libfind/shlfind.mk	2007-02-04 01:00:05.000000000 +0200
-+++ cdrtools-2.01.01/libfind/shlfind.mk	2007-08-28 22:45:14.000000000 +0300
-@@ -21,7 +21,7 @@
- CPPOPTS +=	-DSCHILY_PRINT
- 
- include		Targets
--LIBS=		-lschily -lc
-+LIBS=		-lschily -lc $(LIB_ACL)
- 
- ###########################################################################
- include		$(SRCROOT)/$(RULESDIR)/rules.shl
diff --git a/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha50-asneeded.patch b/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha50-asneeded.patch
deleted file mode 100644
index 3edf55d5136a..000000000000
--- a/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha50-asneeded.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur cdrtools-2.01.01.orig/libfind/libfind.mk cdrtools-2.01.01/libfind/libfind.mk
---- cdrtools-2.01.01.orig/libfind/libfind.mk	2007-02-04 01:00:05.000000000 +0200
-+++ cdrtools-2.01.01/libfind/libfind.mk	2007-08-28 22:33:25.000000000 +0300
-@@ -20,7 +20,7 @@
- CPPOPTS +=	-DSCHILY_PRINT
- 
- include		Targets
--LIBS=		
-+LIBS=		$(LIB_ACL_TEST)
- 
- ###########################################################################
- include		$(SRCROOT)/$(RULESDIR)/rules.lib
-diff -ur cdrtools-2.01.01.orig/libfind/shlfind.mk cdrtools-2.01.01/libfind/shlfind.mk
---- cdrtools-2.01.01.orig/libfind/shlfind.mk	2007-02-04 01:00:05.000000000 +0200
-+++ cdrtools-2.01.01/libfind/shlfind.mk	2007-08-28 22:45:14.000000000 +0300
-@@ -21,7 +21,7 @@
- CPPOPTS +=	-DSCHILY_PRINT
- 
- include		Targets
--LIBS=		-lschily -lc
-+LIBS=		-lschily -lc $(LIB_ACL_TEST)
- 
- ###########################################################################
- include		$(SRCROOT)/$(RULESDIR)/rules.shl
diff --git a/app-cdr/cdrtools/files/cdrtools-2.01.01a03-warnings.patch b/app-cdr/cdrtools/files/cdrtools-2.01.01a03-warnings.patch
deleted file mode 100644
index 86aaad40fecb..000000000000
--- a/app-cdr/cdrtools/files/cdrtools-2.01.01a03-warnings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- cdrtools-2.01.01/RULES/mk-gmake.id.warnings	2005-07-22 16:01:01.000000000 +0200
-+++ cdrtools-2.01.01/RULES/mk-gmake.id	2005-07-22 16:05:27.000000000 +0200
-@@ -30,7 +30,7 @@
- 
- ifndef		ARCH_DONE
- 
--__gmake_warn:=	$(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 2)
-+#__gmake_warn:=	$(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 2)
- 
- _MACHCMD=	(mach || uname -p || true)	2> /dev/null
- _ARCHCMD=	(arch || /usr/ucb/arch || true)	2> /dev/null
---- cdrtools-2.01.01/cdrecord/cdrecord.c.warnings	2005-07-22 16:01:01.000000000 +0200
-+++ cdrtools-2.01.01/cdrecord/cdrecord.c	2005-07-22 16:01:01.000000000 +0200
-@@ -4894,6 +4894,8 @@
- #ifdef	HAVE_UNAME
- 	struct	utsname	un;
- 
-+	/* Try not to break the diff for each cdrecord release */
-+	return;
- 	if (uname(&un) >= 0) {
- 		/*
- 		 * I really hope that the Linux kernel developers will soon