Version bump.

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

3 files changed, 282 insertions, 5 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index ce24345fdac3..0423137a0ac6 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.354 2015/04/25 08:38:08 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.355 2015/06/04 15:03:06 billie Exp $
+
+*cdrtools-3.01_alpha29 (04 Jun 2015)
+
+  04 Jun 2015; Daniel Pielmeier <billie@gentoo.org>
+  +cdrtools-3.01_alpha29.ebuild:
+  Version bump.
 
   25 Apr 2015; Daniel Pielmeier <billie@gentoo.org>
   -cdrtools-3.01_alpha27.ebuild:
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 507ca30166bc..4a08992128f9 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -4,15 +4,17 @@ 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.01a28.tar.bz2 2081108 SHA256 3da9ad914cd5fb68037f7508cadfa05a31e3bb39c655b2dd0933345d44f86c7b SHA512 d703ba99bb9435006931ec8f7864137213d2a89d34611eb4a9e3d6fdaa438af55625da1a6d6005ac70a669f091d7133ff3565ce5be9dbd51723168887ae6baa5 WHIRLPOOL 98e7efbd24bf32dcf04e813127495a02494a2fccac14954f18e1e4843842008512dfe7dfd72c3e534ca0c1bb4ac46754d4479f229bff60e6877dc172c77cf58e
+DIST cdrtools-3.01a29.tar.bz2 2089455 SHA256 3ad98ea911a4ee7811ecfc433b70dac3a3b9671eb71a55da9f4a7e08cb6fc247 SHA512 f7c3eadc3e5f461e5767f12ef49e976ba3c88b4b61402d527606df4ebeb89db7205f23758c222e3f61ef036bfb4c972d3d3e0801efabcc40d6f34746f7348b95 WHIRLPOOL 5ef8c3e82f7f329082cd09f770bca070284e4ae1215ac341d8c80e38d3d1aa28f746a5e5c6dc4018107624524014ec6f88d8db2b114c1571a283aee2b8bd8b20
 EBUILD cdrtools-3.01_alpha17.ebuild 5237 SHA256 dd3795acba623f8e9c80c3c3acf287cc2c60aed3bee9325fb07d9e6edbfee47a SHA512 42b48b0e10ea809e5645f4f401a489fa591d1d083d4d8b0467b524fde723e37eca2ba9d2673c37f81bf247d63e0c0b795a0b9c6639c0f661613a5a52edc7edb5 WHIRLPOOL ba4ee8a0fc4f76d73aa09356bc2901e638a47bd339dc1c288e746a6966e0a24f6985616459b9b80f8043d632e86a43f4cd9d1fd97c8b9867ccb47d575b6b3a7a
 EBUILD cdrtools-3.01_alpha24.ebuild 7984 SHA256 2b4ccd4846adace696efccfbfe09aa492efc44b088d358d528ff6ea0fe94bd42 SHA512 31114f6343206ae9c427004743e683ab279fc9f64d06a5d3869a80e325b73da86f3b3322c7e1823d27b84952a5e4e0924abf6dda8035953f961071425534d1b0 WHIRLPOOL a91d38c8b24007b8d2fd9aaa21711dbda7bdd1f00298960f09728c4c580a14885358c263ac7113c8a126b95680d8db10adf9c5293e331c5b14a029166c9a261c
 EBUILD cdrtools-3.01_alpha28.ebuild 8124 SHA256 5c0f6e630450e00041d3390bc90a858c18483b8289c53f3ffd560d0423284da2 SHA512 8457e74afb0fa9a657b2b239c7d5d519b0c3c9722af0c6aba7bf8bc33882e09273e66bb2b9a5d87c81795cc3eb82ecf0e5c9cd61236c016cb5720253ffcd6d5c WHIRLPOOL 6542fdfaf5066c8537a9093b8787d423dd6b7346f190db13f394f6dc5d7f6761a77e68cf1c87afc9fecd773d24ceaa99335f36730de3c713f35772050b936b7a
-MISC ChangeLog 54300 SHA256 361a8540dc5ffef41d266ff0a449c4d5935f0c3d5845b4666ca84b77c02fdb70 SHA512 8c6947cb45f573a1dd7915510028c000bd803a835b0c2308485c14cfa1cb9f3338e583deab709e60c02fdcc818c69aad39c9f296b194f2aadb4b17975543a610 WHIRLPOOL e1e5b7a687ebc820c4f8861ce33da5d8aad32279ee09676c7638d254996d9491603e1511ca323f336a780f7e4843c3852c4467e761013fd372c1b5bdb4d9a8ae
+EBUILD cdrtools-3.01_alpha29.ebuild 8124 SHA256 bf87a1e3db198fb4ba86e8cc0d6525ee5441d6ad948e6543580f8a82af02f9d7 SHA512 e9e4d335493f0dd6cb70eeea4c1906c9066609807775f759d39886d329ffbc4cd50f5b3f0e27b29109dee384a5ee2145010c6540f43bd37b92a91ef41deb71d5 WHIRLPOOL 3af7ee1c8b37a100b968509d1d595e82f260814e02637bdbc4ef2e168a56e66711fad8f6133bf85d58aa6e69f78ae4b9b2524e123adaf906831123bdbb605ce4
+MISC ChangeLog 54440 SHA256 16d9ec2e1c66117dcbe0ccc665fdb9097fa2e2a715c3ddcd6dadcc0fa5259414 SHA512 efaba4ee9a54fe006e1303dcc96c3139bdb2ea6bc46f4950f20d9f1cff1519f4abeaae3ef40b341a7f2c4de3338b714d9fc46513a223186d199c19e240f8c51c WHIRLPOOL cd4fe9f446028cf0fbddc73656d87b33a9db1cec4379c5706aa0ab3615e4d13932a522130cd30e61459da5369d58a8b238bf8755a558d6d5484ad60b2f3603dc
 MISC metadata.xml 507 SHA256 f1086372c5bae26f9438544c1102cbadc619718b163392cbe35f3b359560ef3b SHA512 77aef4353064a013d1944ee796b1a6cb9a8a60c698d53df46cac7be17c556d9a495c71b9578a536c61c429a0c87e894e962bdca9167bbc60522ef25aeab756a6 WHIRLPOOL 0771499480bc135391ab921f22aba47f9966b68c79083f29f9df8c185919b65422f69953cc876d7dca8a2af5539b85e0c592f4521f5b4034ca5cb6035dc7c28b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlU7UnUACgkQlcuUeyFa0U0ZYACfdYtOMhwGXuXa/SLLNN2N7DYY
-HEcAoO9X7ZzabFjHlo4ZFc1b1zuS5rHV
-=gMWX
+iEYEAREIAAYFAlVwaKsACgkQlcuUeyFa0U0ysQCeKQgJrtjaDkZpmwh5XFPAmHAO
+rWsAniDbDYSizGkWMdBHi58OY5ynzw40
+=ww7f
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha29.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha29.ebuild
new file mode 100644
index 000000000000..7c647b97f6d1
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha29.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha29.ebuild,v 1.1 2015/06/04 15:03:06 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 caps nls unicode"
+
+RDEPEND="acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	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"
+
+	# Enable verbose build.
+	sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
+		RULES/*.rul RULES/rules.prg RULES/rules.inc \
+		|| die "sed verbose 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|" \
+		-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() {
+	use acl || export ac_cv_header_sys_acl_h="no"
+	use caps || export ac_cv_lib_cap_cap_get_proc="no"
+
+	# 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 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
+}