Bump, fixing bug #230940 and bug #234537. Major rewrite to take advantage of built-in make system.

Package-Manager: portage-2.2_rc10/cvs/Linux 2.6.25.8 i686

4 files changed, 123 insertions, 12 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 77c8184d255e..5e5c52e42a17 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.205 2008/07/06 09:45:09 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.206 2008/09/27 23:57:25 loki_val Exp $
+
+*cdrtools-2.01.01_alpha50 (27 Sep 2008)
+
+  27 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/cdrtools-2.01.01_alpha50-asneeded.patch,
+  +cdrtools-2.01.01_alpha50.ebuild:
+  Bump, fixing bug #230940 and bug #234537. Major rewrite to take advantage
+  of built-in make system.
 
 *cdrtools-2.01.01_alpha42 (06 Jul 2008)
 
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 2d92966e03ea..e1e939f6887b 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cdrtools-2.01.01_alpha34-asneeded.patch 1407 RMD160 1d7f740ae9c895c0afa75115642676a515d79403 SHA1 6afe7907a408ef26b917f805ca2327edb976d672 SHA256 9cdfe85219c500541f126108be6ae5b0bfd15e8d8fb90b34dbdff3d9baadcee1
+AUX cdrtools-2.01.01_alpha50-asneeded.patch 941 RMD160 b7f10ef8217a5af1806d6af71d4f2a22baf5cbe3 SHA1 b34b84c626a5e0d88fe36423c1626e23cf023fdb SHA256 15af77303a82bdfefc185c047c1269f2cc4dc3abf215966c661ac2a2172b5ebb
 AUX cdrtools-2.01.01a03-warnings.patch 853 RMD160 5ecadc359bfe6d914f2782b7ea8e7b0bb60e5c14 SHA1 35df7d6adeb1380d72c07fecdf65725b7e708fac SHA256 0d2ca432a854792c82ee89fe6a097c6b3c1621e38fcb6d16c7f88658e62a130d
 DIST cdrtools-2.01.01a34.tar.bz2 1661093 RMD160 f7336d304ffcb28124d3ee3fd3fc8d6ef7c03895 SHA1 0abb5485f186d9da19677aa31cf1e12ab3a3c4e8 SHA256 409003cdfa8a984d82f3b659ace13d4843f41295102262d67cf9bd578011a309
 DIST cdrtools-2.01.01a41.tar.bz2 1667296 RMD160 e307fecc3830a2084d110df4086b5f673a82c74a SHA1 b1849fe6218c111de2eb31bb90df18abf2a7f7f4 SHA256 ac662e40f705ae3a82d0c2a6494c39a2cecee91e191b776aa14525bbe0b5da6a
 DIST cdrtools-2.01.01a42.tar.bz2 1670672 RMD160 f3f0471586caa797c45d3052ca6fbd57c1d7fbd2 SHA1 88cedb4daee7f5715ae73c10fda15013a197d1df SHA256 061f174bff244f5cd6c2c6310abe9921cbf10c0070974c1667145e859b23e498
+DIST cdrtools-2.01.01a50.tar.bz2 1698339 RMD160 2c6c7e99e97635d1b7443596edf8c3af7c099cc4 SHA1 b5fdc3cb7f4a6cb1feda77b9d22be4b8fba5e3bd SHA256 40f7c6e0198cdb7a236898a0b1cddb1473601357bcb9df0f1885e0971487924f
 EBUILD cdrtools-2.01.01_alpha34.ebuild 3283 RMD160 d7a7088ce7a8b6de2df25276c7635ea5e85850fd SHA1 754c2540fd8496d5d4ab32e2205f6cbcd9055530 SHA256 6affcfa4d74884f1f84511edd7832627837630a210de103d13a373fb6f2a1bc8
 EBUILD cdrtools-2.01.01_alpha41.ebuild 3323 RMD160 e12adfdd53b00290a946306599a121f63c0a7249 SHA1 ee1747f6f430980bd03c3ed533cff504d6a84e16 SHA256 c177e7cf4154600dd39878a9ac7233c696c68d2767bd4f669365b2f31d97f35d
 EBUILD cdrtools-2.01.01_alpha42.ebuild 3324 RMD160 acb08049b7f3a096d24638a0d5cf8ac0826a1a37 SHA1 ea2e14dbb6f7617e9034d3dbcdb8a50f75367567 SHA256 0563a81a026e28b455550c112c921f65a32204f305229ff517db08b66c464b43
-MISC ChangeLog 30967 RMD160 492030952e7811257752bc5951d755838b6a8040 SHA1 9a1866fd070d013de6f65c9b94791694ea780154 SHA256 83d0f8d1b479b64df9589a0e24fff68660712b34d86853d9a6e87fec0639c07b
+EBUILD cdrtools-2.01.01_alpha50.ebuild 2601 RMD160 9d93cc0abd3ae6f994cd8370dfb1f64fdaac078c SHA1 31f3538e7c1e42c738a0729c3f1d944baab55a1c SHA256 27685d4e081d525756aa9831f9c274915439073ea7ddbd2456b1a3ead87a4338
+MISC ChangeLog 31254 RMD160 0a5baf08b498cc502b74ab1a29b3a2c9fa716052 SHA1 0774016e105c1278b72a7433de7bf0be686311bd SHA256 8ca8454b170a7bc87e45ba96ae5745cae580d2f9b578e0fdf27c3f90a5c5c209
 MISC metadata.xml 254 RMD160 f274a70fa23d8064efddcce296e0aed3344bd86b SHA1 ab52ea446603ae6242dae41e0c90fcf7ae8f09cf SHA256 21400abf2dad3e5b7b0d2f7f9586c33cba6336b42a97e1f2b3e7e8b9db0daae5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhwlEYACgkQNQqtfCuFneP21QCdGgD3dmOlXbiXFsx3EZPODmZw
-j20AnAzttNAiv8EE1EwAZ8sd9saHnvdt
-=aEjX
------END PGP SIGNATURE-----
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha50.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha50.ebuild
new file mode 100644
index 000000000000..bb00055a0adc
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha50.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha50.ebuild,v 1.1 2008/09/27 23:57:25 loki_val Exp $
+
+inherit multilib eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
+HOMEPAGE="http://cdrecord.berlios.de/"
+SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.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"
+IUSE="unicode"
+
+DEPEND="virtual/libc
+	sys-apps/acl
+	!app-cdr/dvdrtools
+	!app-cdr/cdrkit"
+
+PROVIDE="virtual/cdrtools"
+
+S="${WORKDIR}/${PN}-2.01.01"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "/INSDIR/ s/lib/$(get_libdir)/" \
+		$(grep -l -r '^INSDIR.\+lib\(/siconv\)\?$' .) \
+		|| die "404 on multilib-sed"
+
+	sed -i -e 's:opt/schily:usr:' \
+		$(grep -l --include='*.1' --include='*.8' -r 'opt/schily' .) \
+		$(grep -l --include='*.c' --include='*.h' -r 'opt/schily' .) \
+		|| die "404 on opt-schily sed"
+
+	rm -f $(find . -name '*_p.mk')
+
+	epatch "${FILESDIR}"/${PN}-2.01.01a03-warnings.patch
+	epatch "${FILESDIR}"/${PN}-2.01.01_alpha50-asneeded.patch
+
+	cd "${S}"/DEFAULTS
+	local MYARCH="linux"
+
+	sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH}
+	sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH}
+
+	# For dynamic linking:
+	sed -i "s:static:dynamic:" Defaults.${MYARCH}
+
+	# lame symlinks that all point to the same thing
+	cd "${S}"/RULES
+	local t
+	for t in ppc64 sh4 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
+
+}
+
+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
+	emake CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die
+}
+
+src_install() {
+	emake INS_BASE="${D}/usr/" install
+	#These symlinks are for compat with cdrkit.
+	dosym schily /usr/include/scsilib
+	dosym ../../scg /usr/include/schily/scg
+}
+
+pkg_postinst() {
+	echo
+	einfo "The command line option 'dev=/dev/hdX' (X is the name of your drive)"
+	einfo "should be used for IDE CD writers.  And make sure that the permissions"
+	einfo "on this device are set properly and your user is in the correct group."
+}
diff --git a/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha50-asneeded.patch b/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha50-asneeded.patch
new file mode 100644
index 000000000000..48ebea7ece55
--- /dev/null
+++ b/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha50-asneeded.patch
@@ -0,0 +1,24 @@
+diff -ur cdrtools-2.01.01.orig/libfind/libfind.mk cdrtools-2.01.01/libfind/libfind.mk
+--- cdrtools-2.01.01.orig/libfind/libfind.mk	2007-02-04 01:00:05.000000000 +0200
++++ cdrtools-2.01.01/libfind/libfind.mk	2007-08-28 22:33:25.000000000 +0300
+@@ -20,7 +20,7 @@
+ CPPOPTS +=	-DSCHILY_PRINT
+ 
+ include		Targets
+-LIBS=		
++LIBS=		$(LIB_ACL)
+ 
+ ###########################################################################
+ include		$(SRCROOT)/$(RULESDIR)/rules.lib
+diff -ur cdrtools-2.01.01.orig/libfind/shlfind.mk cdrtools-2.01.01/libfind/shlfind.mk
+--- cdrtools-2.01.01.orig/libfind/shlfind.mk	2007-02-04 01:00:05.000000000 +0200
++++ cdrtools-2.01.01/libfind/shlfind.mk	2007-08-28 22:45:14.000000000 +0300
+@@ -21,7 +21,7 @@
+ CPPOPTS +=	-DSCHILY_PRINT
+ 
+ include		Targets
+-LIBS=		-lschily -lc
++LIBS=		-lschily -lc $(LIB_ACL)
+ 
+ ###########################################################################
+ include		$(SRCROOT)/$(RULESDIR)/rules.shl