Version bump. Quiet down repoman a bit.

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

5 files changed, 134 insertions, 6 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 3cc71295fa7f..6b84668cb102 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.233 2009/07/11 10:41:59 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.234 2009/09/04 16:22:05 billie Exp $
+
+*cdrtools-2.01.01_alpha64 (04 Sep 2009)
+
+  04 Sep 2009; Pielmeier Daniel <billie@gentoo.org>
+  cdrtools-2.01.01_alpha34.ebuild, cdrtools-2.01.01_alpha51.ebuild,
+  +cdrtools-2.01.01_alpha64.ebuild:
+  Version bump. Quiet down repoman a bit.
 
 *cdrtools-2.01.01_alpha61 (11 Jul 2009)
 
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 744685db8d27..e553186fd978 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.01a57.tar.bz2 1779673 RMD160 d7e8ea512a1e8ecaf3be6a9c4a782ff16c1d5253 SHA1 e07ec85d42df24ecf5f15236bb0cc4968be47f98 SHA256 d393863ecbb595eb389360fedcf63f51e7897168175cd219b0dfd1ef3ac2ad35
 DIST cdrtools-2.01.01a60.tar.bz2 1787126 RMD160 b71d57f799286d5c9f88d1dee24aeecc1fcb07a9 SHA1 2e613f726218d2bdc707ce2240721cd2c9dddcf0 SHA256 ecd4abd279c7b78b9b881549977ee576eb1336b41021850581d40609623287f3
 DIST cdrtools-2.01.01a61.tar.bz2 1801498 RMD160 8f36fb84be487e24929d382347aae72889c830fa SHA1 4dd0b4bc51a066b0eab69d1c0f5d2269806f158f SHA256 42eb2334fd0dd0c83856cd90dcf0c5c70e9f7c2152045baea71f02564b5fced0
-EBUILD cdrtools-2.01.01_alpha34.ebuild 3243 RMD160 5363b823214c653a4371ce79bad359598b13d741 SHA1 25e8206bcb2d0affe57ee661752afc0e3ddbe713 SHA256 36f2750c1d2422b859de566d4ebfff53a8d6ee27df82de3dd8481f082cff62ad
-EBUILD cdrtools-2.01.01_alpha51.ebuild 3158 RMD160 e070e3d83b8f06405265f0bf4f926505ff44172b SHA1 ab17face8e53e376912ad3b84752ec77a8ef9267 SHA256 c21e52075b7d37910ac8b870114262a955f22cb18438dfca1e6082f64e585a22
+DIST cdrtools-2.01.01a64.tar.bz2 1836328 RMD160 d609abe707c41d1a66bec7bb1ff4ae7967e5b355 SHA1 2e4af9079527bd5683dc778d1400ef68b595fd36 SHA256 b3bd7ae55c29d8d8cf419e8b04c49606baf9f573a797f62075b80b5d60798733
+EBUILD cdrtools-2.01.01_alpha34.ebuild 3260 RMD160 5206b76e007adb707c9aa56fd8796159f856e64e SHA1 53d98aa2d5c1fba71348d18c224e71ebb81fecdd SHA256 8a541934425735234f057c293cb10e6df3c6563386162121863c7aee8b25dc01
+EBUILD cdrtools-2.01.01_alpha51.ebuild 3176 RMD160 c7dd86b644c090e39675d9ac30eca0e28c4a8f5e SHA1 61c6e0458796e494d6970d1b4f9a2b47a845be6a SHA256 4ab25deb7c4681fd2daf10207501157dbb8cc1623937041f4643b28169636eb4
 EBUILD cdrtools-2.01.01_alpha57-r1.ebuild 3741 RMD160 e33768607c3eb47dac4c0d0316404fcab34bad3e SHA1 3b34dde1f622724ba233b10a3b1d8947c11c2e45 SHA256 cc9c4ea9e7f580b91d4d6b19254a309bb8599d2ea1596a16a249101f6fd10943
 EBUILD cdrtools-2.01.01_alpha60.ebuild 3755 RMD160 2fbf49266a3b0bd83ba7fb5688e54044187483be SHA1 eaac7753aad3a4358aea00e4fe6bc2ae819c7a44 SHA256 ca9840ee99cbdf1b51a0f77330bbc2e8284d2adddfe1a1928d68dc4976d6763f
 EBUILD cdrtools-2.01.01_alpha61.ebuild 3752 RMD160 bfdda0c0e4d652a12fc1b816b3d016e6a5232ecb SHA1 5621dd7b1f3c7a32d1abafcca600ce67906d9d4d SHA256 9f2cf6e144f893afa81442dc171628f21f3aa65af10a63f76b4f197781284068
-MISC ChangeLog 36097 RMD160 9fb020cb714cd1d16745ccad282cad3486c452a8 SHA1 76586a6581b988a8f21016a5c018425d5d239c39 SHA256 2ebb01c35b7d250d7cda9b44da2f65af0f8b74aa3d8b2f55f3aebd672022bc90
+EBUILD cdrtools-2.01.01_alpha64.ebuild 3750 RMD160 ecf2cecd7b128acc6f58b3cf17330eff492ef801 SHA1 a2c3cedee767c9165f4b555f57d3f967016d7de9 SHA256 b8f8ce3e66963ef98ba278d36f26d3b40edee507171620e68bb69d48e7496356
+MISC ChangeLog 36337 RMD160 35b6f6d1a2a3359106ac0484957b08984ff72a3b SHA1 f921cbf9429887623b48eb9d5b29c053df6cf4c2 SHA256 e70e25991444145daad579600dc3153bd346d3122873fde07f3111ce48865e8b
 MISC metadata.xml 254 RMD160 f274a70fa23d8064efddcce296e0aed3344bd86b SHA1 ab52ea446603ae6242dae41e0c90fcf7ae8f09cf SHA256 21400abf2dad3e5b7b0d2f7f9586c33cba6336b42a97e1f2b3e7e8b9db0daae5
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild
index ebc6b35167b0..e006ac30a83c 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild
@@ -1,6 +1,6 @@
 # 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_alpha34.ebuild,v 1.14 2009/05/28 15:28:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha34.ebuild,v 1.15 2009/09/04 16:22:05 billie Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -15,6 +15,7 @@ IUSE="unicode"
 
 DEPEND="!app-cdr/dvdrtools
 	!app-cdr/cdrkit"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}-2.01.01
 
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha51.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha51.ebuild
index 3722e08efed5..06c6b5d7293c 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha51.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha51.ebuild
@@ -1,6 +1,6 @@
 # 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_alpha51.ebuild,v 1.9 2009/05/28 15:28:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha51.ebuild,v 1.10 2009/09/04 16:22:05 billie Exp $
 
 inherit multilib eutils toolchain-funcs flag-o-matic
 
@@ -16,6 +16,7 @@ IUSE="unicode"
 DEPEND="sys-apps/acl
 	!app-cdr/dvdrtools
 	!app-cdr/cdrkit"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}-2.01.01
 
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha64.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha64.ebuild
new file mode 100644
index 000000000000..b743cf3f22a1
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha64.ebuild
@@ -0,0 +1,117 @@
+# 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_alpha64.ebuild,v 1.1 2009/09/04 16:22:05 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/"
+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.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}" \
+		GMAKE_NOWARN="true" || die "emake failed"
+}
+
+src_install() {
+	emake -j1 MANDIR="share/man" INS_BASE="${D}/usr/" INS_RBASE="${D}" \
+		GMAKE_NOWARN="true" 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."
+}