Version bump.

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

3 files changed, 152 insertions, 2 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index d6dbd2e4fe4b..5aa36280a73f 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.278 2011/03/08 17:48:35 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.279 2011/04/12 21:08:41 billie Exp $
+
+*cdrtools-3.01_alpha04 (12 Apr 2011)
+
+  12 Apr 2011; Daniel Pielmeier <billie@gentoo.org>
+  +cdrtools-3.01_alpha04.ebuild:
+  Version bump.
 
 *cdrtools-3.01_alpha03 (08 Mar 2011)
 
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 5476eb5bcfc8..77008a1a77bb 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST cdrtools-3.00.tar.bz2 1978563 RMD160 210684ab5e286ef59b788b49bd0b74d88f6435f4 SHA1 6464844d6b936d4f43ee98a04d637cd91131de4e SHA256 7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d
 DIST cdrtools-3.01a02.tar.bz2 1994677 RMD160 6b1876b1d9a5fa000229a7187d72b13dcf6971bf SHA1 36b318a913d0db6cc86940a0ad6e2adea19b3324 SHA256 1c63195e57c2855463b226ab8afdc6665717f948d8c004208f4e27d81fd8f597
 DIST cdrtools-3.01a03.tar.bz2 1997110 RMD160 30e754d46e136fac41a11072a58c62d99212c86a SHA1 3099cb4a3c984cdc84825d68e6a134af890a6a33 SHA256 c6845a3c5b7e89af02a57bdc0d7b6667d7e2d7942d03f7d962adb7cab73b9462
+DIST cdrtools-3.01a04.tar.bz2 1997119 RMD160 0562346ff7b487f50e236b4846fed1e9628022c9 SHA1 936a83a4ae36ddf51ef9a4a719e6c49a98ae5f62 SHA256 a140e20f2c8e9115d0f0af3e5d750ddf04cf786e1a966f02fc0e97469309ccec
 EBUILD cdrtools-3.00.ebuild 4067 RMD160 6f155cb16b29dcd31b500622f88f9d0e1919d3ce SHA1 59c66ba6567aad7ea6fb776b696d1ffcc8c6a39a SHA256 664e5adb7ab7a7b41992b98633b0f31b1f24745b01c525aa20db6bf0e1493f3a
 EBUILD cdrtools-3.01_alpha02.ebuild 4199 RMD160 05953c1ec456e1d5d34cc2a54aa24eef1c4de860 SHA1 1c866864e47113824cad1919fd19b3473d98b4cf SHA256 6dad33b42fa564051ca99ae84b7b0f9a9db6650a0557b36de172515e8aae6414
 EBUILD cdrtools-3.01_alpha03.ebuild 4199 RMD160 af024580740cae7559cdb851caad51bafa808b1f SHA1 359b78137c67f8fa5e19f1cd12021a9d9e275330 SHA256 935d0aa88a618f08a02dd31652f183cdfdd79841ec1fe37e88eac9f292e0b17e
-MISC ChangeLog 43267 RMD160 86a9c96adae752783ba027c6d02e6e44cc902067 SHA1 d73e87ee1cc5c047e7e34e62497141e218b2ead5 SHA256 f2141ac4a5c4de1565f6ac5480280ef84d9ce0f413bc88c01f7ad3ed4f680243
+EBUILD cdrtools-3.01_alpha04.ebuild 4199 RMD160 f17143ff92e43852cce23808245d32626b5dccd6 SHA1 9adbb1d09aa7e81e2dbfd2afaa6f849b19d556ae SHA256 d6002c179dce19eb46e8c07447f3a7fb83c8efc241dca80f81e9ccbe62715dab
+MISC ChangeLog 43407 RMD160 e8b643602778296fcca193dff29f104cb5f18af0 SHA1 ffba6712b2f448009e9f5baf7f390f06544367ab SHA256 ebb3af9f6824141e406c8af7aff4a3b1ac6eed17d347d91fd475f0432db40584
 MISC metadata.xml 344 RMD160 a34ca9abb9d6e97a232f4b7d183e5350bbf2c978 SHA1 4f4dd69accee941e41b7d46e9038c50dce8e534f SHA256 1827502e9d2cfa583db6a17f065462b760bf3770fcac22a0145d6a560b2b34f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2kv2sACgkQlcuUeyFa0U2h2ACfWirssSoTC5NoK/9DNs3VuQPf
+k0IAnRhNz/L29g0OMh309sljbqmE7Ykf
+=EUbL
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha04.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha04.ebuild
new file mode 100644
index 000000000000..214f71b92c02
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha04.ebuild
@@ -0,0 +1,132 @@
+# 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_alpha04.ebuild,v 1.1 2011/04/12 21:08:41 billie Exp $
+
+EAPI=2
+
+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/dvdrtools
+	!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
+
+	# 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" || die "emake"
+}
+
+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 || die "emake install"
+
+	# These symlinks are for compat with cdrkit.
+	dosym schily /usr/include/scsilib || die "dosym scsilib"
+	dosym ../scg /usr/include/schily/scg || die "dosym scg"
+
+	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux \
+		|| die "dodoc"
+
+	cd "${S}"/cdda2wav
+	docinto cdda2wav
+	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO \
+		|| die "dodoc cdda2wav"
+
+	cd "${S}"/mkisofs
+	docinto mkisofs
+	dodoc ChangeLog* TODO || die "dodoc mkisofs"
+
+	# Remove man pages related to the build system
+	rm -rvf "${D}"/usr/share/man/man5
+}