Bump

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 128 insertions, 2 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 360bb825373a..592a75176c64 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.229 2009/05/20 16:41:52 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.230 2009/05/21 22:15:38 loki_val Exp $
+
+*cdrtools-2.01.01_alpha60 (21 May 2009)
+
+  21 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +cdrtools-2.01.01_alpha60.ebuild:
+  Bump
 
   20 May 2009; nixnut <nixnut@gentoo.org>
   cdrtools-2.01.01_alpha57-r1.ebuild:
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index d57b59bf95b5..ec9b061ba080 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -6,10 +6,12 @@ DIST cdrtools-2.01.01a51.tar.bz2 1756159 RMD160 a539823760e029c165f447687dd065f0
 DIST cdrtools-2.01.01a53.tar.bz2 1767998 RMD160 bdc7b15632d32eff23bc40098c1738eec4c3e353 SHA1 adebb6ee17ff0ab2d7da1d6ca455cf66596302c6 SHA256 f0b1d2e69d2ae1e3ae63e22b9a511d1fab4959b44974557f8857e168550c187b
 DIST cdrtools-2.01.01a57.tar.bz2 1779673 RMD160 d7e8ea512a1e8ecaf3be6a9c4a782ff16c1d5253 SHA1 e07ec85d42df24ecf5f15236bb0cc4968be47f98 SHA256 d393863ecbb595eb389360fedcf63f51e7897168175cd219b0dfd1ef3ac2ad35
 DIST cdrtools-2.01.01a59.tar.bz2 1783905 RMD160 34bf2e5531e2313752c847c5915a9e3a0138a159 SHA1 71c43687f2662942ff18386d1cc7423f567a218e SHA256 1d49fd67c540588fc7d0799252db6eae2eb5943411eca31f08896e4ee55ffd7e
+DIST cdrtools-2.01.01a60.tar.bz2 1787126 RMD160 b71d57f799286d5c9f88d1dee24aeecc1fcb07a9 SHA1 2e613f726218d2bdc707ce2240721cd2c9dddcf0 SHA256 ecd4abd279c7b78b9b881549977ee576eb1336b41021850581d40609623287f3
 EBUILD cdrtools-2.01.01_alpha34.ebuild 3283 RMD160 d7a7088ce7a8b6de2df25276c7635ea5e85850fd SHA1 754c2540fd8496d5d4ab32e2205f6cbcd9055530 SHA256 6affcfa4d74884f1f84511edd7832627837630a210de103d13a373fb6f2a1bc8
 EBUILD cdrtools-2.01.01_alpha51.ebuild 3199 RMD160 995a34c6e3769decea8fc4f98ea5cdf77cc8aa35 SHA1 d18ba43829a41a094227566dd95a21c8a69353aa SHA256 5462737a98fc09642b8f40430d95a94dba5ce7c0ccde016bb72b1c1e06412b9a
 EBUILD cdrtools-2.01.01_alpha53.ebuild 3212 RMD160 d08f9f1c6de1b5ff1354f6557048e8150352e11e SHA1 f87a638e071c44e70be78c487f875c7988fcd100 SHA256 f0076c0d10b5c8a5a60d79a65b5ff97029da09f8a898c86d0949740a1a03db41
 EBUILD cdrtools-2.01.01_alpha57-r1.ebuild 3789 RMD160 8c8320fb552df927fa01ed693ba44833a8e12b54 SHA1 175778a0336dfe17e785e45aa68f66e324607f1f SHA256 bd5c53bc2a6b4356f607e193f592ee8fc72a7d40f8bccd23f38efe09dce1c50b
 EBUILD cdrtools-2.01.01_alpha59.ebuild 3798 RMD160 fcd75182fa98121061f3e6b623788446bb233d31 SHA1 0aa16a16c575fb9bb956d965c0a27e41e1835902 SHA256 ce9a3daba74b623c954cd7b756b87f106bb34ad31deccb1400667100b3803c7e
-MISC ChangeLog 35286 RMD160 0ff06b6c7783d81eb1139925fac5f4914b235b45 SHA1 8e5555a3095a4539c5ab93b4c78adc1958ac141b SHA256 b19d7b02554adde0927a611c7455c0d663aafd2059fb3f60c48e3e4fb570fe09
+EBUILD cdrtools-2.01.01_alpha60.ebuild 3798 RMD160 a82170db588e71d886607875838e839ed4641a27 SHA1 0e1afc8f086350f70dc7f375c70ad24845293e01 SHA256 e03c3e5bc78eb7d0861585f3582857bf03afdd27d9ed1a152fea668989f4a1a2
+MISC ChangeLog 35426 RMD160 fa27bf1a204220e62af2e8c760fc15808941c246 SHA1 bfb85c0b6e151079249c25c8764f6ace86be51ec SHA256 c7917eb854c4d56dcac916bf8cafa9616b62a7a60e59cfaea2dad92d0830f051
 MISC metadata.xml 254 RMD160 f274a70fa23d8064efddcce296e0aed3344bd86b SHA1 ab52ea446603ae6242dae41e0c90fcf7ae8f09cf SHA256 21400abf2dad3e5b7b0d2f7f9586c33cba6336b42a97e1f2b3e7e8b9db0daae5
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha60.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha60.ebuild
new file mode 100644
index 000000000000..452a73f79c5d
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha60.ebuild
@@ -0,0 +1,118 @@
+# 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_alpha60.ebuild,v 1.1 2009/05/21 22:15:38 loki_val 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="virtual/libc
+	acl? ( sys-apps/acl )
+	!app-cdr/dvdrtools
+	!app-cdr/cdrkit"
+RDEPEND="${DEPEND}"
+
+PROVIDE="virtual/cdrtools"
+
+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."
+}