Version bump. Remove old.

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

3 files changed, 65 insertions, 50 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 36d1e34e6c97..fa04cdc7aec9 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/cdrtools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.242 2009/12/02 18:54:00 billie Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.243 2010/01/12 18:21:46 billie Exp $
+
+*cdrtools-2.01.01_alpha72 (12 Jan 2010)
+
+  12 Jan 2010; Daniel Pielmeier <billie@gentoo.org>
+  -cdrtools-2.01.01_alpha68.ebuild, +cdrtools-2.01.01_alpha72.ebuild:
+  Version bump. Remove old.
 
   02 Dec 2009; Daniel Pielmeier <billie@gentoo.org>
   cdrtools-2.01.01_alpha69.ebuild:
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 5abb1b5aeae0..6de1f25418c9 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -2,10 +2,10 @@ AUX cdrtools-2.01.01_alpha34-asneeded.patch 1407 RMD160 1d7f740ae9c895c0afa75115
 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.01a68.tar.bz2 1850334 RMD160 8c2530f8386d804f644dea4ec4f7d26846a82689 SHA1 612c46e6560a53e38562b70b574c66413270ee88 SHA256 d3649e0beadbe8b0b46f130ea7343bbb592984cd2679e9196806e90051652aed
 DIST cdrtools-2.01.01a69.tar.bz2 1851038 RMD160 1006076aecdf0bc2f467a675b2116c5d51c3c59b SHA1 5da138f393b14b478e3df4f95324f3ea1b7a3cc2 SHA256 b85fa9de4729e428acb4611b1af361d341691d85519533d353ef42d0d2b30c87
+DIST cdrtools-2.01.01a72.tar.bz2 1857422 RMD160 9f946e0aaa1ff3806363e360a02232f846921685 SHA1 5902c71f8b9452a80cf040c0005213f15cabd310 SHA256 8860915aa3f1c3145fa578b2e3e66a695a89fc52fe6e14a0bcf0563759861adf
 EBUILD cdrtools-2.01.01_alpha57-r1.ebuild 3741 RMD160 e33768607c3eb47dac4c0d0316404fcab34bad3e SHA1 3b34dde1f622724ba233b10a3b1d8947c11c2e45 SHA256 cc9c4ea9e7f580b91d4d6b19254a309bb8599d2ea1596a16a249101f6fd10943
-EBUILD cdrtools-2.01.01_alpha68.ebuild 3848 RMD160 b04fb9ee81036e292b0e22cafa045a8d7c47ba75 SHA1 647f555242a88e362a42038c8939c392674ce290 SHA256 6b220a0b34ed86560010f2e22a36019110ee3fede8fd86438c9001334b26f497
 EBUILD cdrtools-2.01.01_alpha69.ebuild 3731 RMD160 8d8aa1ed1613d42210fabd680b09f9c7ef954bf8 SHA1 4855bddab9a35c2e0c0b9ad47a73d1ee18cd9ddb SHA256 d8e5b1aa6935ccb9cc3b2ea22d868bdeb45814e905114b1360710769d5262861
-MISC ChangeLog 38125 RMD160 d918de60a3dc5a5c434174c157001043b1d62045 SHA1 7cc37f4060bb095c6dea049a54ca70ec56fdfe53 SHA256 95e9e9a6013a516d9e6c28c93de4a49419aa3866f4cd60fb52d7d77b9e435a2b
+EBUILD cdrtools-2.01.01_alpha72.ebuild 3918 RMD160 d26f41674f1b827eee99bb03d68137074cf5a303 SHA1 a3a32e30aef5bf96ef997afa3594dfa8aedcba68 SHA256 5ad2e2133735bd21ea4d9fe229ea4aefe52c1678bdb2a3869f8e2b406f9de001
+MISC ChangeLog 38317 RMD160 2164a63675b3e5e44d1bcfd4f8aae8d5d8ddbcb2 SHA1 02495db262b3fb5e720bd8ad6a990e506b5b20a7 SHA256 bb051603e8d011c64070e9aa06374095bb0dc71c73a58e9be73588e23bde1f8f
 MISC metadata.xml 254 RMD160 f274a70fa23d8064efddcce296e0aed3344bd86b SHA1 ab52ea446603ae6242dae41e0c90fcf7ae8f09cf SHA256 21400abf2dad3e5b7b0d2f7f9586c33cba6336b42a97e1f2b3e7e8b9db0daae5
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha68.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha72.ebuild
index 6e64cb26b383..54efb743ad28 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha68.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha72.ebuild
@@ -1,86 +1,87 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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_alpha68.ebuild,v 1.1 2009/11/19 18:09:55 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha72.ebuild,v 1.1 2010/01/12 18:21:46 billie 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/"
+HOMEPAGE="http://cdrecord.berlios.de/private/cdrecord.html"
+if [[ ${PV%_alpha*} == ${PV} ]] ; then
+SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/${P}.tar.bz2"
+else
 SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2"
+fi
 
 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"
+IUSE="acl unicode"
 
 DEPEND="acl? ( sys-apps/acl )
 	!app-cdr/dvdrtools
 	!app-cdr/cdrkit"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}-2.01.01
+S=${WORKDIR}/${P/_alpha[0-9][0-9]}
 
 src_prepare() {
+	# Remove profiled make files.
+	rm -f $(find . -name '*_p.mk') || die "rm profiled"
+
 	# Adjusting hardcoded paths.
 	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"
+		$(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
+		|| die "sed opt/schily"
 
 	sed -i -e "s:\(^INSDIR=\t\tshare/doc/\):\1${PF}/:" \
-		$(grep -l -r 'INSDIR.\+doc' .) \
-		|| die "404 on doc sed"
+		$(find ./ -type f -exec grep -l 'INSDIR.\+doc' '{}' '+') \
+		|| die "sed doc"
 
 	# Respect libdir.
 	sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \
-		$(grep -l -r '^INSDIR.\+lib\(/siconv\)\?$' .) \
-		|| die "404 on multilib-sed"
+		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
+		|| die "sed multilib"
 
-	# 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.
-	rm -f $(find . -name '*_p.mk') || die "rm failed"
-
-	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"
+		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
+		|| die "sed rules"
 
+	# Respect CC/CXX variables.
 	cd "${S}"/RULES
-
-	# Respect CC/CXX variables
 	local tcCC=$(tc-getCC)
 	local tcCXX=$(tc-getCXX)
 	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
-		rules1.top || die "sed rules1.top failed"
+		rules1.top || die "sed rules1.top"
 	sed -i -e "/^\(CC\|DYNLD\|LDCC\|MKDEP\)/s|gcc|${tcCC}|" \
 		-e "/^\(CC++\|DYNLDC++\|LDCC++\|MKC++DEP\)/s|g++|${tcCXX}|" \
-		cc-gcc.rul || die "sed cc-gcc.rul failed"
+		cc-gcc.rul || die "sed cc-gcc.rul"
 	sed -i -e "s|^#CONFFLAGS +=\t-cc=\$(XCC_COM)$|CONFFLAGS +=\t-cc=${tcCC}|g" \
-		rules.cnf || die "sed rules.cnf failed"
+		rules.cnf || die "sed rules.cnf"
 
 	# Create additional symlinks needed for some archs.
 	local t
-	for t in ppc64 sh4 s390x ; do
+	for t in ppc64 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
+
+	# Schily make setup.
+	cd "${S}"/DEFAULTS
+	local os="linux"
+
+	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"
 }
 
 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
@@ -91,29 +92,37 @@ src_compile() {
 		fi
 	fi
 
+	local acl="-lacl"
 	if ! use acl
 	then
 		CFLAGS="${CFLAGS} -DNO_ACL"
-		ACL=""
+		acl=""
 	fi
+
 	# If not built with -j1, "sometimes" cdda2wav will not be built. Bug?
-	emake -j1 CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" \
-		LIB_ACL_TEST="${ACL}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" \
-		LINKMODE="dynamic" GMAKE_NOWARN="true" || die "emake failed"
+	emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
+		LDOPTX="${LDFLAGS}" LINKMODE="dynamic" LIB_ACL_TEST="${acl}" \
+		GMAKE_NOWARN="true" || die "emake"
 }
 
 src_install() {
 	# If not built with -j1, "sometimes" manpages are not installed. Bug?
-	emake -j1 MANDIR="share/man" INS_BASE="${D}/usr/" INS_RBASE="${D}" \
-		LINKMODE="dynamic" GMAKE_NOWARN="true" install
+	emake -j1 INS_BASE="${D}/usr/" INS_RBASE="${D}" MANDIR="share/man" \
+		LINKMODE="dynamic" GMAKE_NOWARN="true" install || die "emake install"
 
 	# These symlinks are for compat with cdrkit.
-	dosym schily /usr/include/scsilib
-	dosym ../scg /usr/include/schily/scg
+	dosym schily /usr/include/scsilib || die "dosym scsilib"
+	dosym ../scg /usr/include/schily/scg || die "dosym scg"
 
-	dodoc ABOUT Changelog README README.linux-shm START READMEs/README.linux || die "dodoc cdrtools"
+	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux \
+		|| die "dodoc"
 
 	cd "${S}"/cdda2wav
 	docinto cdda2wav
-	dodoc FAQ Frontends HOWTOUSE TODO || die "dodoc cdda2wav"
+	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO \
+		|| die "dodoc cdda2wav"
+
+	cd "${S}"/mkisofs
+	docinto mkisofs
+	dodoc ChangeLog* TODO || die "dodoc mkisofs"
 }