Version bump.

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

3 files changed, 146 insertions, 5 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index d05105bf7709..7342934393a2 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.283 2011/08/28 15:43:10 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.284 2011/10/18 17:11:08 billie Exp $
+
+*cdrtools-3.01_alpha06 (18 Oct 2011)
+
+  18 Oct 2011; Daniel Pielmeier <billie@gentoo.org>
+  +cdrtools-3.01_alpha06.ebuild:
+  Version bump.
 
   28 Aug 2011; Daniel Pielmeier <billie@gentoo.org> cdrtools-3.00.ebuild,
   cdrtools-3.01_alpha05.ebuild:
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 1a5d7b810782..6518a37c0948 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -3,14 +3,16 @@ Hash: SHA256
 
 DIST cdrtools-3.00.tar.bz2 1978563 RMD160 210684ab5e286ef59b788b49bd0b74d88f6435f4 SHA1 6464844d6b936d4f43ee98a04d637cd91131de4e SHA256 7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d
 DIST cdrtools-3.01a05.tar.bz2 2001070 RMD160 a3962ce855a52d9eb7f5d528e1d91226a77f78bd SHA1 e9a5c6413c9e0e9e52fbd634ab9f1e3a1157b832 SHA256 5ac9d5d08ea178fd1747b86298a67fe81cc9eee414a8df3a947373af2ad81bcf
+DIST cdrtools-3.01a06.tar.bz2 2026840 RMD160 abf83892bbea28906c88c1f109d42891dd34f721 SHA1 0001d0213dfe2c78c4b8b34288854c01c5387464 SHA256 d554429d62a38d5afff68cae35a44ee2f564ee8fedc4c2e73b28249d28b3e7a3
 EBUILD cdrtools-3.00.ebuild 4181 RMD160 cd282f91d5aea86d295dad57d8550b1e8ae9b247 SHA1 d8ca832a3ac7c1b9272ad6ba47911584ed5270f6 SHA256 3f960865bfde655f9b184638ff83a0b3f0314b2244c790f5049ff045a745bb9d
 EBUILD cdrtools-3.01_alpha05.ebuild 4164 RMD160 367c6dbdc29f6db72307f20fcf209633d828b8c8 SHA1 5206088d721db3306c34c48966dd484916ad05cc SHA256 465b3e9388a413d99f291b6ea567da753a2915ddaf4ca3b60b36cfb5b416bcc3
-MISC ChangeLog 44092 RMD160 310c366d97f5ed8bac3b3c7132b2e28c15d48abe SHA1 eb2b00d0661547ba29ce9c2071853d8744608988 SHA256 dc02a93becc11ab4e38ffe78357ec262c4aba74f2a5ef1c461dda462fc5f78fd
+EBUILD cdrtools-3.01_alpha06.ebuild 4164 RMD160 371e778659559f5131ae61a7068eecf006e8d549 SHA1 b4d10a430204cdbcb7ddf55e0229004f30a42f9b SHA256 eb2ace49fc3f5c750383a437b144ae50122ddc42d01ccc9b5c44db7abfc857dc
+MISC ChangeLog 44232 RMD160 7304118eced9208b52b5d04bba0ca047e7c67e8f SHA1 a02605ffe0d85f2f8f995aa28dd1d4e43666cbdf SHA256 df75a4ae9f012b8f66d728df05cedd1feacaa1d0e0cfd7b1a5c1eddd7413ac8b
 MISC metadata.xml 344 RMD160 a34ca9abb9d6e97a232f4b7d183e5350bbf2c978 SHA1 4f4dd69accee941e41b7d46e9038c50dce8e534f SHA256 1827502e9d2cfa583db6a17f065462b760bf3770fcac22a0145d6a560b2b34f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk5aYiMACgkQlcuUeyFa0U2rxQCgmoDszS8m2IGXmk3vwH/RpzJz
-rE8An1vaDBdHglSRlm6m3UAaIv9SPgGp
-=dOHl
+iEYEAREIAAYFAk6dszIACgkQlcuUeyFa0U3E2ACgysMEYEhH/utCfCoQgvwgGEpv
+7jsAn1qY30aRhbxRX71Rm3IHWXn6VVgE
+=FC3H
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha06.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha06.ebuild
new file mode 100644
index 000000000000..ae23dffcdc98
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha06.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha06.ebuild,v 1.1 2011/10/18 17:11:08 billie Exp $
+
+EAPI=4
+
+inherit multilib eutils toolchain-funcs flag-o-matic
+
+MY_P="${P/_alpha/a}"
+
+DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
+HOMEPAGE="http://cdrecord.berlios.de/private/cdrecord.html"
+SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha/')/${MY_P}.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 ~x86-fbsd"
+IUSE="acl unicode"
+
+DEPEND="acl? ( virtual/acl )
+	>=sys-devel/gettext-0.18.1.1
+	!app-cdr/cdrkit"
+RDEPEND="${DEPEND}"
+
+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:' \
+		$(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}/:" \
+		$(find ./ -type f -exec grep -l 'INSDIR.\+doc' '{}' '+') \
+		|| die "sed doc"
+
+	# Respect libdir.
+	sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \
+		$(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"
+
+	# Respect CC/CXX variables.
+	cd "${S}"/RULES
+	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"
+	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"
+	sed -i -e "s|^#CONFFLAGS +=\t-cc=\$(XCC_COM)$|CONFFLAGS +=\t-cc=${tcCC}|g" \
+		rules.cnf || die "sed rules.cnf"
+
+	# Create additional symlinks needed for some archs (armv4l already created)
+	local t
+	for t in armv4tl armv5l armv5tel armv6l armv7l 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
+
+	# amd64-fbsd support
+	ln -s i386-freebsd-cc.rul amd64-freebsd-cc.rul || die
+	ln -s i386-freebsd-gcc.rul amd64-freebsd-gcc.rul || die
+
+	# 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 "s:bin:root:g" \
+		Defaults.${os} || die "sed Schily make setup"
+}
+
+# skip obsolete configure script
+src_configure() { : ; }
+
+src_compile() {
+	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"
+	fi
+
+	# 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}" \
+		INS_BASE="${D}/usr" INS_RBASE="${D}" LINKMODE="dynamic" \
+		RUNPATH="" GMAKE_NOWARN="true"
+}
+
+src_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
+
+	# These symlinks are for compat with cdrkit.
+	dosym schily /usr/include/scsilib
+	dosym ../scg /usr/include/schily/scg
+
+	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
+
+	cd "${S}"/cdda2wav
+	docinto cdda2wav
+	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
+
+	cd "${S}"/mkisofs
+	docinto mkisofs
+	dodoc ChangeLog* TODO
+
+	# Remove man pages related to the build system
+	rm -rvf "${D}"/usr/share/man/man5
+}