Revision bump. Adding a patch by me and Joerg Schilling to fix bug #480666. Thanks to Thomas Maguin for the report and Joerg Schilling for debugging this issue.

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

4 files changed, 263 insertions, 5 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 3946eec83020..c5b24b649d21 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.313 2013/10/09 13:43:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.314 2013/10/12 08:46:59 billie Exp $
+
+*cdrtools-3.01_alpha17-r1 (12 Oct 2013)
+
+  12 Oct 2013; Daniel Pielmeier <billie@gentoo.org>
+  +cdrtools-3.01_alpha17-r1.ebuild,
+  +files/cdrtools-3.01_alpha17-capabilities.patch:
+  Revision bump. Adding a patch by me and Jörg Schilling to fix bug #480666.
+  Thanks to Thomas Maguin for the report and Jörg Schilling for debugging this
+  issue.
 
   09 Oct 2013; Jeroen Roovers <jer@gentoo.org> cdrtools-3.01_alpha17.ebuild:
   Stable for HPPA (bug #486318).
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index f649aec013bb..a2ba0ac5b6f0 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cdrtools-3.01_alpha17-capabilities.patch 2786 SHA256 00e469a52591eae387083b5677db4670e397a3aad434120cd1b4782d0f645614 SHA512 f5bd2b694f916478f162c102762497df0a9bef8b085d44975624b15378b9cd7ad6f1fe95ef5750678df47879487cdcfc8dd1599da6b9b418d05446dd71be605d WHIRLPOOL 3c92b02ba9bbfb915cf9f967fcf7f3399c9c17eb1eb5c44317e3a5d19682d3817df2bc15412966bd67b06c327f849030548cb6b1314210dd103283d07c9b2064
 DIST cdrtools-3.00.tar.bz2 1978563 SHA256 7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d SHA512 93887afd6c244814b7f6a623f0ac5b551934626163065a6f32aefe82aa7438450fd7a42737ef3cdaad3f18841c066d25e72e37891531dd0be5be328692712cec WHIRLPOOL a02750131e4ec55df10387a01dab3881afee669cd8b8ea65eaed4fdd82e6bd11040c6d79fc64ccc9377e787f5903ec92ea3ae81db1945554b65a8636737cc931
 DIST cdrtools-3.01a17.tar.bz2 2061522 SHA256 3d613965b213ad83e4be0ba2535e784901839ea4d11a20a2beb6765f0eb76dfa SHA512 34a0579c536028b030cf828441ad55a705472646bc3a1ae962aad234fbe0b12c2bcb670511487c17086f5ba7643d1b8ae42a4a86bfe2940dc94f9744377daa8b WHIRLPOOL b718d559e0b36a576a42a38f84b3917891450d0bbab47b084eb1e906a396cf28ce47b79fd16565d4e0697311ee0c3d5abdd95b52ba2d7ae4e9f32d9b26bc26e1
 EBUILD cdrtools-3.00.ebuild 4233 SHA256 a495c12da2cd2c8520e22e4f68930fb9b89b00474737fc2ed957d508cd6c19cd SHA512 5fafd3b220dc0cf725b22512ea1f122f07018950d803071ab10fbab3bac4b266b743a4c739220099b053952757be6a58ed4d198bda09923f80bc0cfd300c04d4 WHIRLPOOL f2733313073dc15c6463f30557729b5b53b8f07f40f3dd962f7cd5622b2f0c75fcfecc9ca1ae52a6a0908760dfdf7644ca7a91e4870a8841923fa63976118b56
+EBUILD cdrtools-3.01_alpha17-r1.ebuild 4972 SHA256 82ff19b7c385a72d4f9106c1999452aeba43451c75d5d6207acb5059f741a542 SHA512 eff0be26ee75bbeb5054b6c0b660a5045a6a6a25f588620d2aa17bcb974b0ef9238e938bcd1de9ecddc3158559cea66bae08c8bddbb78d41a0943cfab91103b8 WHIRLPOOL 93f58849e2bb25f0e3056b8fb48331259e0547d375987874459957fde11245507a3374f4191a8b5387e84e559a4b7cce77928b31fc5b032b5999c032c4e7cdb1
 EBUILD cdrtools-3.01_alpha17.ebuild 4905 SHA256 408b3e653983c6862c51ed8e80410f54936d83a7cf401b3fd295bcf4882bc7e4 SHA512 2f2f4673e806b7e8ae70b11493ecfe5d5a26d98f1168fa988f20bcac2ff4c4c7b03199edc654a367d55c8370d7d8d4e2d162e40dbaea69034e95acaed3677bc6 WHIRLPOOL 3004e85929ef2186f0923ab17c5f1867079886dc1c8d27a3c9e1599a99217a3b64f2b2ba07f82b501a9487b2bae52c12a7246355a8c763e7d80f1036f6ab617c
-MISC ChangeLog 48394 SHA256 2e6d8cdcbce5eb85da7c2cbd7e3522bc738ee01bf95e47707e14b2ee696f62f1 SHA512 66b01e8ca82b550fa77e40f02e8afd5a93f237987fd51f518e01c439bdf235f0e1a3a78267a6181c757adce030b040af159b6c78d358e0ac913c476eafc8f5ad WHIRLPOOL 5764c288ff013a847b6000042b5db2fa7a2dbceee58c9c476900fb12e13fc7e346094d7b19773f15f3c728cf6662d886d26a80f1e3a694cdfe5ba82092aebdf6
+MISC ChangeLog 48745 SHA256 67280edcab45dadc1e21e5d496b92cd61215d9950548bcdd0a86b5f81dfb7e2b SHA512 977a29565f794b92283aa97d53fb2f30d7a24aa80facf5d36a227ebfb5d74b9a782513e3e28cee3fc5a1cfa030361d04635c6d6332e2f1ffac32c8856f09c83b WHIRLPOOL 69f188c4b86221e3ff7c4de2be79fc2f7e63d625c8a956c21706dd3795e1bb438517cfaf367a0d7316b48fc0e84745b334ed9afb58b0302e37577e3619d84102
 MISC metadata.xml 507 SHA256 f1086372c5bae26f9438544c1102cbadc619718b163392cbe35f3b359560ef3b SHA512 77aef4353064a013d1944ee796b1a6cb9a8a60c698d53df46cac7be17c556d9a495c71b9578a536c61c429a0c87e894e962bdca9167bbc60522ef25aeab756a6 WHIRLPOOL 0771499480bc135391ab921f22aba47f9966b68c79083f29f9df8c185919b65422f69953cc876d7dca8a2af5539b85e0c592f4521f5b4034ca5cb6035dc7c28b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJVXX0ACgkQVWmRsqeSphMiwgCeLXduyoIFAu7P9IuS0nm9vmUe
-4BQAn1SV2iYjQfER6awG+4HkUZvaHhH9
-=lsYN
+iEYEAREIAAYFAlJZDIQACgkQlcuUeyFa0U2tKgCg1WqyE6OwkNae95CKFGv9GuwP
+5kIAmgM4C4rYLRRK3RN5GPLcttxnaCJd
+=D1AY
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha17-r1.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha17-r1.ebuild
new file mode 100644
index 000000000000..b72020655020
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha17-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha17-r1.ebuild,v 1.1 2013/10/12 08:46:59 billie Exp $
+
+EAPI=5
+
+inherit fcaps 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 ~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}
+	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
+)
+
+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}|" \
+		-e "/COPTOPT=/s/-O//" \
+		-e 's/$(GCCOPTOPT)//' \
+		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 armv5tel 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"
+	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
+
+	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"
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-capabilities.patch"
+}
+
+# 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 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 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
+		LDOPTX="${LDFLAGS}" \
+		INS_BASE="${ED}/usr" INS_RBASE="${ED}" 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="${ED}/usr" INS_RBASE="${ED}" 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 "${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
+}
diff --git a/app-cdr/cdrtools/files/cdrtools-3.01_alpha17-capabilities.patch b/app-cdr/cdrtools/files/cdrtools-3.01_alpha17-capabilities.patch
new file mode 100644
index 000000000000..83c61994445e
--- /dev/null
+++ b/app-cdr/cdrtools/files/cdrtools-3.01_alpha17-capabilities.patch
@@ -0,0 +1,88 @@
+--- cdrecord/priv.c	2013-10-12 09:51:46.385760482 +0200
++++ cdrecord/priv.c	2013-10-12 09:53:16.545766912 +0200
+@@ -111,14 +111,13 @@
+ 	/*
+ 	 * Give up privs we do not need anymore.
+ 	 * We no longer need:
+-	 *	cap_dac_override,cap_net_bind_service,cap_sys_nice,cap_sys_resource
++	 *	cap_dac_override,cap_net_bind_service,cap_sys_nice
+ 	 */
+ 	cap_t		cset;
+ 	cap_value_t	caplist[] = {
+ 					CAP_DAC_OVERRIDE,
+ 					CAP_NET_BIND_SERVICE,
+ 					CAP_SYS_NICE,
+-					CAP_SYS_RESOURCE,
+ 					CAP_SYS_RAWIO,		/* Keep as CAP_EFFECTIVE */
+ 					CAP_SYS_ADMIN		/* Keep as CAP_EFFECTIVE */
+ 				};
+@@ -128,7 +127,7 @@
+ 	cap_set_flag(cset, CAP_EFFECTIVE, NCAPS-2, caplist, CAP_CLEAR);
+ 	cap_set_flag(cset, CAP_INHERITABLE, NCAPS, caplist, CAP_CLEAR);
+ 	if (cap_set_proc(cset) < 0)
+-		errmsg("Cannot set process capabilities.\n");
++		errmsg("Cannot set initial process capabilities.\n");
+ #endif	/* HAVE_LINUX_CAPS */
+ #endif	/* HAVE_PRIV_SET */
+ }
+@@ -153,14 +152,13 @@
+ 	/*
+ 	 * Get back privs we may need now.
+ 	 * We need:
+-	 *	cap_dac_override,cap_net_bind_service,cap_sys_nice,cap_sys_resource
++	 *	cap_dac_override,cap_net_bind_service,cap_sys_nice
+ 	 */
+ 	cap_t		cset;
+ 	cap_value_t	caplist[] = {
+ 					CAP_DAC_OVERRIDE,
+ 					CAP_NET_BIND_SERVICE,
+-					CAP_SYS_NICE,
+-					CAP_SYS_RESOURCE
++					CAP_SYS_NICE
+ 				};
+ 
+ 	cset = cap_get_proc();
+@@ -168,7 +166,7 @@
+ 	cap_set_flag(cset, CAP_EFFECTIVE, NCAPS, caplist, CAP_SET);
+ 	cap_set_flag(cset, CAP_INHERITABLE, NCAPS, caplist, CAP_SET);
+ 	if (cap_set_proc(cset) < 0)
+-		errmsg("Cannot set process capabilities.\n");
++		errmsg("Cannot regain process capabilities.\n");
+ #endif	/* HAVE_LINUX_CAPS */
+ #endif	/* HAVE_PRIV_SET */
+ }
+@@ -193,14 +191,13 @@
+ 	/*
+ 	 * Give up privs we do not need anymore.
+ 	 * We no longer need:
+-	 *	cap_dac_override,cap_net_bind_service,cap_sys_nice,cap_sys_resource
++	 *	cap_dac_override,cap_net_bind_service,cap_sys_nice
+ 	 */
+ 	cap_t		cset;
+ 	cap_value_t	caplist[] = {
+ 					CAP_DAC_OVERRIDE,
+ 					CAP_NET_BIND_SERVICE,
+-					CAP_SYS_NICE,
+-					CAP_SYS_RESOURCE
++					CAP_SYS_NICE
+ 				};
+ 
+ 	cset = cap_get_proc();
+@@ -208,7 +205,7 @@
+ 	cap_set_flag(cset, CAP_EFFECTIVE, NCAPS, caplist, CAP_CLEAR);
+ 	cap_set_flag(cset, CAP_INHERITABLE, NCAPS, caplist, CAP_CLEAR);
+ 	if (cap_set_proc(cset) < 0)
+-		errmsg("Cannot set process capabilities.\n");
++		errmsg("Cannot deactivate process capabilities.\n");
+ #endif	/* HAVE_LINUX_CAPS */
+ #endif	/* HAVE_PRIV_SET */
+ }
+@@ -265,7 +262,7 @@
+ 	cap_set_flag(cset, CAP_INHERITABLE, NCAPS, caplist, CAP_CLEAR);
+ 	cap_set_flag(cset, CAP_PERMITTED, NCAPS, caplist, CAP_CLEAR);
+ 	if (cap_set_proc(cset) < 0)
+-		errmsg("Cannot set process capabilities.\n");
++		errmsg("Cannot drop process capabilities.\n");
+ #endif	/* HAVE_LINUX_CAPS */
+ #endif	/* HAVE_PRIV_SET */
+ }