Version bump.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D

3 files changed, 288 insertions, 2 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 59a662f82cec..fb1d2bd592bd 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.345 2014/09/21 06:54:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.346 2014/10/11 10:37:48 billie Exp $
+
+*cdrtools-3.01_alpha25 (11 Oct 2014)
+
+  11 Oct 2014; Daniel Pielmeier <billie@gentoo.org>
+  +cdrtools-3.01_alpha25.ebuild:
+  Version bump.
 
   21 Sep 2014; Patrick Lauer <patrick@gentoo.org> cdrtools-3.01_alpha17.ebuild,
   cdrtools-3.01_alpha24.ebuild:
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index b484403733d8..b1a0af5adc3a 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST cdrtools-3.01a17.tar.bz2 2061522 SHA256 3d613965b213ad83e4be0ba2535e784901839ea4d11a20a2beb6765f0eb76dfa SHA512 34a0579c536028b030cf828441ad55a705472646bc3a1ae962aad234fbe0b12c2bcb670511487c17086f5ba7643d1b8ae42a4a86bfe2940dc94f9744377daa8b WHIRLPOOL b718d559e0b36a576a42a38f84b3917891450d0bbab47b084eb1e906a396cf28ce47b79fd16565d4e0697311ee0c3d5abdd95b52ba2d7ae4e9f32d9b26bc26e1
 DIST cdrtools-3.01a24.tar.bz2 2075400 SHA256 4d9907b84f5b65dc6ca278b6202b90b8eb68652b01aa4dda978ffede8bdd4a5b SHA512 19be30de77fca00bb06fa6325149421304c1d5ff7d40a9d842496058494fcf0e798678c661ff3ae9ebc9e4c5971917f7aabfd813a6d88ff863d7e2e5f1456766 WHIRLPOOL 4533288dffef2b702eeef2a44fd702aff3e66283d5d90c810eb177ee4f1f1aa7cfd75238bf1f2a406e9b8ccaa43c7a77fb401825f8ce806e73fdc80abcc0a45a
+DIST cdrtools-3.01a25.tar.bz2 2078958 SHA256 12c555263c9b56d83ea104918c0c6c7df41c3dd51206ae1986e88aed892b29be SHA512 0de8cf853d1c6419fd6c343ab241764cccc35aae8338225f682043250b0fafff33c347c59bcf1703e89fa92d5a8f3aad131f34ca00670765be452eafa651950b WHIRLPOOL 1ee2dd129f22db7fed48592221f08861104d2cca4f2aaeae01b36a429b3c590ae183d4cbedd623c90a4b6b60b989ddcc8eb27941ca69a9dbf8f4667a8479f619
 EBUILD cdrtools-3.01_alpha17.ebuild 5209 SHA256 b73eb56658a031b67ec86f0767b2fd6708992d43ebb190f3b45ae31f01f4856d SHA512 f646b5608356f483dd8e65ad536fa9c67eb23ea6c05cadaf843b4b8e4e9544dab605c920b2c8e5f4b83a13cb95ad7449b1d35e276cd51f92660ae00347184a19 WHIRLPOOL 00a7fd2f1ab97f702099e426ea220d66b4e59d38333057b8dd54bd62ccca6d2bf54301b2110d0d304a5617d32abc6a2d8af92ea3ee617a03c4ca53c47d7afbe1
 EBUILD cdrtools-3.01_alpha24.ebuild 7971 SHA256 0e88d9d46bcecdf7ec1d54f37a30fe712cb84c4c9c812e31dadc694ce1f7e0b0 SHA512 20df1313608734f6aa27ed922d1e06f1be85fe81934736f62ffffa867c1d0f816c67e7001cefac932a22c802deb9c9243c5cd5864f0c61258e3b447f4fdf8a3e WHIRLPOOL bf53996bedcdba3b14cc6aae045df135d83dbc83ed2c25ca22604c54ff22f9d354c94f1b8bb99cc2c9ba0735c79243b357c3f473d85cc0dd55eab4d8270975f3
-MISC ChangeLog 52849 SHA256 b15944a214309c88d18cdcab8120d593c7670554d4b33cc14c48bf3bb6456b83 SHA512 8acc8299cca479a79bdc44da0bbdc998ac83302e7ecb4fcb366158835bb44ae6433d63a3f018eee38c80cba98d6faf4a30f9e13ae658d6bccc53cf549492475c WHIRLPOOL db12b1fe3d8699a1cfeefe477ab2c4af27462a0760035d526c2f4a997c9c4f1a269675d423e9e23d07ff14b56a6f060386497f1c8f47ec2eb8a40ac477228202
+EBUILD cdrtools-3.01_alpha25.ebuild 7971 SHA256 89b162c45ee9f93fd12fdbd1f65d6dbf56fec1d223cfd972d58ae053cf583f70 SHA512 493214554f97e47e8ce6bcdde50be0ee3fcf72ca5574a60f94a1e4c33ee1e0c5841efcb3d7dc7f9c862e5451dc37d6a1a3ce314454c7a3c3cf914d3edbcb9cb9 WHIRLPOOL 5483f0e64ae4b3e4ee4fa794d35085554099933e4e2e613c3284189542a28ef6ee6924731f602f68083806dc2647f5fbfc128b6d815b6b446b6b1ad878076f20
+MISC ChangeLog 52988 SHA256 59286802928b587893276d398476528dce79dcd0e81a99188f34d4174a60befb SHA512 f73d27853462152225a8613aaa094b6afda7b2ce3d108996b9bd8a23b0885f57f870176995f055b8aab01f642dd6f68a332e6f58d1f6f15bbd2444ad427724ec WHIRLPOOL 8e7c0a7bc9bdb5dd5ab4dbc6232665627edaacbaecaed7f1e48f892e0da29183c1586fa32fdd46b1942f16a39c3150f7c68a90270c5fb8f5dcccae3b36b881c7
 MISC metadata.xml 507 SHA256 f1086372c5bae26f9438544c1102cbadc619718b163392cbe35f3b359560ef3b SHA512 77aef4353064a013d1944ee796b1a6cb9a8a60c698d53df46cac7be17c556d9a495c71b9578a536c61c429a0c87e894e962bdca9167bbc60522ef25aeab756a6 WHIRLPOOL 0771499480bc135391ab921f22aba47f9966b68c79083f29f9df8c185919b65422f69953cc876d7dca8a2af5539b85e0c592f4521f5b4034ca5cb6035dc7c28b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlQ5CIEACgkQlcuUeyFa0U0fegCfejAEztFcjQCNk0UZiEaW9c81
+wUEAnRyWBlmyyMMWOD2/bqcM/1pQcVPQ
+=X9/P
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha25.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha25.ebuild
new file mode 100644
index 000000000000..3333a36df9b3
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha25.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha25.ebuild,v 1.1 2014/10/11 10:37:48 billie Exp $
+
+EAPI=5
+
+inherit fcaps multilib eutils toolchain-funcs flag-o-matic gnuconfig
+
+MY_P="${P/_alpha/a}"
+
+DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
+HOMEPAGE="http://sourceforge.net/projects/cdrtools/"
+SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="acl nls unicode"
+
+RDEPEND="acl? ( virtual/acl )
+	nls? ( virtual/libintl )
+	!app-cdr/cdrkit"
+DEPEND="${RDEPEND}
+	x11-misc/makedepend
+	nls? ( >=sys-devel/gettext-0.18.1.1 )"
+
+S=${WORKDIR}/${P/_alpha[0-9][0-9]}
+
+FILECAPS=(
+	cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
+	cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
+	cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
+)
+
+cdrtools_os() {
+	local os="linux"
+	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
+	[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
+	echo "${os}"
+}
+
+src_prepare() {
+	gnuconfig_update
+
+	# Remove profiled make files.
+	find -name '*_p.mk' -delete
+
+	# 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_COM_DEF=/s|gcc|${tcCC}|" \
+		-e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \
+		-e "/COPTOPT=/s|-O||" \
+		-e 's|$(GCCOPTOPT)||' \
+		cc-gcc.rul || die "sed cc-gcc.rul"
+	sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
+		rules.cnf || die "sed rules.cnf"
+
+	# Add support for arm64
+	ln -sf i586-linux-cc.rul aarch64-linux-cc.rul
+	ln -sf i586-linux-gcc.rul aarch64-linux-gcc.rul
+
+	# Schily make setup.
+	cd "${S}"/DEFAULTS
+	local os=$(cdrtools_os)
+
+	sed -i \
+		-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
+		-e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
+		-e "s|^\(LDPATH=\).*|\1\t\t-L/usr/lib|" \
+		-e "s|^\(RUNPATH=\).*|\1|" \
+		-e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
+		-e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
+		-e "s|^\(DEFINSGRP=\).*|\1\t0|" \
+		-e '/^DEFUMASK/s,002,022,g' \
+		Defaults.${os} || die "sed Schily make setup"
+	# re DEFUMASK above:
+	# bug 486680: grsec TPE will block the exec if the directory is
+	# group-writable. This is painful with cdrtools, because it makes a bunch of
+	# group-writable directories during build. Change the umask on their
+	# creation to prevent this.
+}
+
+ac_cv_sizeof() {
+	cat <<-EOF >"${T}"/test.c
+	#include <inttypes.h>
+	#include <stddef.h>
+	#include <stdint.h>
+	#include <sys/types.h>
+	int main () {
+		static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
+		test_array [0] = 0;
+		return test_array [0];
+	}
+	EOF
+
+	local i=1
+	while [[ ${i} -lt 20 ]] ; do
+		if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
+			echo ${i}
+			return 0
+		fi
+		: $(( i += 1 ))
+	done
+	return 1
+}
+
+src_configure() {
+	# skip obsolete configure script
+	if tc-is-cross-compiler ; then
+		# Cache known values for targets. #486680
+
+		tc-export CC
+		local var val t types=(
+			char "short int" int "long int" "long long"
+			"unsigned char" "unsigned short int" "unsigned int"
+			"unsigned long int" "unsigned long long"
+			float double "long double" size_t ssize_t ptrdiff_t
+			mode_t uid_t gid_t pid_t dev_t time_t wchar_t
+			"char *" "unsigned char *"
+		)
+		for t in "${types[@]}" ; do
+			var="ac_cv_sizeof_${t// /_}"
+			var=${var//[*]/p}
+			val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
+			export "${var}=${val}"
+			einfo "Computing sizeof(${t}) as ${val}"
+		done
+		# We don't have these types.
+		export ac_cv_sizeof___int64=0
+		export ac_cv_sizeof_unsigned___int64=0
+		export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
+		export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
+		export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
+
+		export ac_cv_type_prototypes="yes"
+		export ac_cv_func_mlock{,all}="yes"
+		export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
+		export ac_cv_func_dtoa_r="no"
+		export ac_cv_func_sys_siglist{,_def}="no"
+		export ac_cv_func_printf_{j,ll}="yes"
+		export ac_cv_realloc_null="yes"
+		export ac_cv_no_user_malloc="no"
+		export ac_cv_var_timezone="yes"
+		export ac_cv_var___progname{,_full}="yes"
+		export ac_cv_fnmatch_igncase="yes"
+		export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
+		export ac_cv_file__usr_src_linux_include="no"
+
+		case $(cdrtools_os) in
+		linux)
+			export ac_cv_func_bsd_{g,s}etpgrp="no"
+			export ac_cv_hard_symlinks="yes"
+			export ac_cv_link_nofollow="yes"
+			export ac_cv_access_e_ok="no"
+
+			export ac_cv_dev_minor_noncontig="yes"
+			case ${ac_cv_sizeof_long_int} in
+			4) export ac_cv_dev_minor_bits="32";;
+			8) export ac_cv_dev_minor_bits="44";;
+			esac
+
+			cat <<-EOF >"${T}"/test.c
+			struct {
+				char start[6];
+				unsigned char x1:4;
+				unsigned char x2:4;
+				char end[5];
+			} a = {
+				.start = {'S', 't', 'A', 'r', 'T', '_'},
+				.x1 = 5,
+				.x2 = 4,
+				.end = {'_', 'e', 'N', 'd', 'X'},
+			};
+			EOF
+			${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
+			if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
+				export ac_cv_c_bitfields_htol="no"
+			elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
+				export ac_cv_c_bitfields_htol="yes"
+			fi
+			;;
+		esac
+	fi
+}
+
+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 filecaps; then
+		CFLAGS="${CFLAGS} -DNO_LINUX_CAPS"
+	fi
+
+	if ! use acl; then
+		CFLAGS="${CFLAGS} -DNO_ACL"
+	fi
+
+	# If not built with -j1, "sometimes" cdda2wav will not be built.
+	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
+		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
+}
+
+src_install() {
+	# If not built with -j1, "sometimes" manpages are not installed.
+	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
+		LDOPTX="${LDFLAGS}" 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 "${ED}"/usr/share/man/man5
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		einfo
+		einfo "Darwin/OS X use the following device names:"
+		einfo
+		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
+		einfo
+		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
+		einfo
+	fi
+}