Version bump.

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

3 files changed, 271 insertions, 15 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index fc2ea94fe715..0c6e8a492303 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.331 2014/01/21 02:50:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.332 2014/01/24 18:08:35 billie Exp $
+
+*cdrtools-3.01_alpha22 (24 Jan 2014)
+
+  24 Jan 2014; Daniel Pielmeier <billie@gentoo.org>
+  +cdrtools-3.01_alpha22.ebuild:
+  Version bump.
 
   21 Jan 2014; Mike Frysinger <vapier@gentoo.org> cdrtools-3.01_alpha17.ebuild,
   cdrtools-3.01_alpha19.ebuild, cdrtools-3.01_alpha21.ebuild:
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 31d1be9b3547..adad9d2beeeb 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -5,26 +5,18 @@ DIST cdrtools-3.00.tar.bz2 1978563 SHA256 7f9cb64820055573b880f77b2f16662a512518
 DIST cdrtools-3.01a17.tar.bz2 2061522 SHA256 3d613965b213ad83e4be0ba2535e784901839ea4d11a20a2beb6765f0eb76dfa SHA512 34a0579c536028b030cf828441ad55a705472646bc3a1ae962aad234fbe0b12c2bcb670511487c17086f5ba7643d1b8ae42a4a86bfe2940dc94f9744377daa8b WHIRLPOOL b718d559e0b36a576a42a38f84b3917891450d0bbab47b084eb1e906a396cf28ce47b79fd16565d4e0697311ee0c3d5abdd95b52ba2d7ae4e9f32d9b26bc26e1
 DIST cdrtools-3.01a19.tar.bz2 2065394 SHA256 9680547e0be8efa82d2ef542af47b5c0f465bc23fd5d8af27cb0328e4e5ba35e SHA512 88c1b23ce436bb2265bc64bb31b42904d48946ead2bda07a284371f2637e58b837a15dc6731d5f43f33cf9f9edbec7cf386b2b98a9ea4ccb71a3412f78e28981 WHIRLPOOL 5dc9a990cfc19e0148de8fd718ee0e017dd9f25d5ba8996d3b5ed740344abd8d6d8ec0b2ad7b4aebe16b2edefda67e5de1bc6ce5c3679e170f02ad8c263808ef
 DIST cdrtools-3.01a21.tar.bz2 2063194 SHA256 729ed9462dd284193571b151616ed4c594d948edfb9511b1579d1cb96d468734 SHA512 234d4f71977375649fac636bba995b269cb17914e269f88416002b83205073370b526bc12f01a0d53d1c8e28166dea7a9e52700c1b98112e7661c9555606e83c WHIRLPOOL 5b53de1762bee5b8a785ac1a3942cd77055f44dadd4910103f20d643ebb73e7c29a3371a269b1234bf327a36e2c2af609838a1287983ceb640f76b3a02f2721f
+DIST cdrtools-3.01a22.tar.bz2 2067421 SHA256 a779865367421d8c85f7ecc2c9a2f2871f53143bc0ca43f4434bdb081358a81b SHA512 d200173c97ee7e5107dd8f22b89c61b26a4cc323f40ae72a7f96955404775210c223b5d9094ea1e923c3c8148c963f66dfe6a8982a4d4d8317fb49cfc744da37 WHIRLPOOL e255b3e5e2573b98cc2cacdda10878664d167441ee0fcb484fee7dab43709915dbb12ca43026947b710ce3f73e66679242dad9b59068e691d2e61330c51aa1a3
 EBUILD cdrtools-3.00.ebuild 4233 SHA256 a835a994ddaad174c18ac3d8dbb7f0e45c32222d9b58db7034aefc65a363a634 SHA512 d9f8b8f86bed84a29864efe539915790cd4e1294211c1881eeca6a3a6d82fcc5f0f98c88477d2e47eeef09d870b0def61b444d4120f31d6c1cd3bc05218e104b WHIRLPOOL 912fdd8d847c3a462b270d1ef0593a9660ab8396cb59fd86df9a2894a59b86117813a43aef39c7207344a2acec667a3cd2e9ecdcebe265ea2025f42a1fad0501
 EBUILD cdrtools-3.01_alpha17.ebuild 4933 SHA256 65f896c36dff127d3720c13fb80efdbfe63a72a986174dd08257aee9a2f6e350 SHA512 371d2063e66f9a0e7241dd6a0ea268c1c86a24ba7cb3dafeda9adb681b6a9f286107588e4b029e4b26e8c5c395d6dbd898d083a946015c530183d61a59443852 WHIRLPOOL 94b4a244a86ed1f4547c10086fa94d39506d9796948a2b34809a73f59c6162d2c4731ad9b29f5d2da51965c3e5ee8c50f124861f17c02c5ffde53377b5926a9a
 EBUILD cdrtools-3.01_alpha19.ebuild 4970 SHA256 7eac3be7babc33c0e39a4a0cc326c1d74ccd9e339bf0eb2f6d1824484d1aa044 SHA512 de8f4152ad6d11fc0b23e96c35c7d0289175a842357d326265af3cbc61c45c50c56bcb244756bc57396601b17dbd4c188c91a183411055ff2f689db17db22a0e WHIRLPOOL 78c5114805171c844ca12df34b681e4d26b4997e58a5f50bd3225f4d565bbc439fb2d1fc593ff49ded8163d7af4a87360fb03817dc78ca7f35c6dc44362d2eb5
 EBUILD cdrtools-3.01_alpha21.ebuild 7577 SHA256 e1d680f29bbc82a833dae0b550c6fe913e9f012cca0d91e23467dfd703fb4894 SHA512 30224ef7bd20a25e217d6ce81e06f50bde2b92565b1691691bf3e3c0be7332c1eb55c15f4086ff9399af3eecdbaa115dbe04bd275915f9fec449f6fc17266936 WHIRLPOOL e93a156959bf7ff3a4627a7dec8293bbb39909e4536cbe63134369bf44ddd59e8bd1cf4f4852c236cb3cfc82ce144b0f311fd2f36f6233a82e0398a0564fe337
-MISC ChangeLog 50947 SHA256 dae4de35fe1101c109ef18d9137220def8241cb0947460382fa163eab8abb21c SHA512 2e819ee1c8b27756f8f785cd86a0cdac59c1d3dc84d992f3cab268765af5a9f2edb49788449076ac4d8ef77e1f5729aeee0a47019f2cf51a0d9c72829aa72a58 WHIRLPOOL ae428ec10531eb9e272507e18457f771b352d3f57a08bb42b9c89f23a9727bf64a5a098ab1ccc155a164cbe313d0f2ddb374d4976498cee3c23d30179ba8471c
+EBUILD cdrtools-3.01_alpha22.ebuild 7577 SHA256 526a52de8ce4162ba61bf5ee654bafc0acc71f2cd904b7af46512c7e96af10ff SHA512 203420f18c8453a12d54643b86d2c33935a2925853f14dff5b3431ebd8ba706cdb0e9023ccdd987b7bb28278850b9a2fb37c6144dd84f685d3e1d379afb0576e WHIRLPOOL 2b23715da3b16dee1f3308aae41c07db2169da52b92ff58a6e01c1c8aba3ff9ffdf57ebde5f72d1824b1071ad9cac5403ca6408baf2f936fcc8c40f59b5764f4
+MISC ChangeLog 51087 SHA256 dff7466bfdf432ecf27db873256d5797a85efffd67d513409052798be9cadff8 SHA512 81af56bc0676f900d9b2d31b76fa9678a02ad83ea7f6237ef2d0f02891dbd00a13e9545941afd39f4d7f210b62944416439cd040df447492bc1b17f1fcd2c9e4 WHIRLPOOL 1680b75455ff3d187394b39a8687997939b8d7051b7c339f46bbc516e6c047c380255758c8dd74cb3d1cba70c066398f2914a2e2a16c00d9062e31771a3c7c95
 MISC metadata.xml 507 SHA256 f1086372c5bae26f9438544c1102cbadc619718b163392cbe35f3b359560ef3b SHA512 77aef4353064a013d1944ee796b1a6cb9a8a60c698d53df46cac7be17c556d9a495c71b9578a536c61c429a0c87e894e962bdca9167bbc60522ef25aeab756a6 WHIRLPOOL 0771499480bc135391ab921f22aba47f9966b68c79083f29f9df8c185919b65422f69953cc876d7dca8a2af5539b85e0c592f4521f5b4034ca5cb6035dc7c28b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS3eCXAAoJEPGu1DbS6WIArqYQAJvOrUGm7YYq367+JCSxxEVM
-iMsRUVBfdDwTZuyYiwZgLzpt2B53A0AIEn1KivDep8DOqc6VcmljcpiKW7g8Qvvn
-mFHyH7FoswagXXY+9v2kw2PD7H2k5LFKaVVc0N+EufdufvEXX3I5Vo+oClv3jrLM
-tvyHnqBejOuCWPeHf5JQNWK6/xCNVxGBGUZdkjM7sYxe77tyruu5f4SRvMM1S8n3
-PkqvhMe7m+c8TBhN/f3simn4tZOPJ0suh7s9CYenmyWnVz7VirLJ6yf3nirdJRJ4
-ctyNMuCpXiQ5IuXttEmDyqiVLmnOB63HlmHddn+550bXn6Gr7rK25lLfOB2uu51p
-RN0bY5L22AUkEsscoRuJvSrHOnqnC4WwETZWKHKc08oDbxMehKFOX4NH9vjhPJWt
-XtjN3wocZ0uSRGfx8QF2SvbMxmjAnHwkHQiF7deO1t+hT107uVMiMNWQsGaprE+G
-Pj05EFaxXFeVrpmKWUkx8N+4ZP8JCMTks2KlpbUyPHmfvJW3mQjNQtKXQIw96IaV
-5M7itepueQNcz7AfjnfUQr0nG+LBZzHkIGMaF4ri8Kw+GAubt+vq8D2L1GrzUAZe
-/IF+XZRkctiD608TXb4cU45wobL1squzD7MOLyblnt2tQja41udTprF9lme9TUpO
-cTGi5187Z5+t5heXfck5
-=3THj
+iEYEAREIAAYFAlLirCgACgkQlcuUeyFa0U1m0ACg5XLhlaKeiyaQA5QyB4VvBcXX
+C/sAoOpBO+ml4qly4d2RrdMUUES88WvZ
+=0xCl
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha22.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha22.ebuild
new file mode 100644
index 000000000000..e3a49641c314
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha22.ebuild
@@ -0,0 +1,258 @@
+# 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_alpha22.ebuild,v 1.1 2014/01/24 18:08:36 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://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 ~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.
+	rm -f *_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_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"
+
+	# 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\troot|" \
+		Defaults.${os} || die "sed Schily make setup"
+}
+
+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
+}