Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-cdr
diff options
context:
space:
mode:
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/cdrtools/ChangeLog12
-rw-r--r--app-cdr/cdrtools/cdrtools-2.01.01_alpha57-r1.ebuild115
-rw-r--r--app-cdr/cdrtools/cdrtools-2.01.01_alpha79.ebuild (renamed from app-cdr/cdrtools/cdrtools-2.01.01_alpha77.ebuild)20
-rw-r--r--app-cdr/cdrtools/files/cdrtools-2.01.01_alpha34-asneeded.patch36
-rw-r--r--app-cdr/cdrtools/files/cdrtools-2.01.01_alpha50-asneeded.patch24
-rw-r--r--app-cdr/cdrtools/files/cdrtools-2.01.01a03-warnings.patch22
6 files changed, 23 insertions, 206 deletions
diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 8a2c5ca19d6d..72861ac20ed8 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for app-cdr/cdrtools
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.259 2010/05/16 17:32:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.260 2010/05/18 18:59:25 billie Exp $
+
+*cdrtools-2.01.01_alpha79 (18 May 2010)
+
+ 18 May 2010; Daniel Pielmeier <billie@gentoo.org>
+ -cdrtools-2.01.01_alpha57-r1.ebuild, -cdrtools-2.01.01_alpha77.ebuild,
+ +cdrtools-2.01.01_alpha79.ebuild,
+ -files/cdrtools-2.01.01_alpha34-asneeded.patch,
+ -files/cdrtools-2.01.01_alpha50-asneeded.patch,
+ -files/cdrtools-2.01.01a03-warnings.patch:
+ Version bump. This also fixes bug #289110. Remove old.
16 May 2010; Raúl Porcel <armin76@gentoo.org>
cdrtools-2.01.01_alpha75.ebuild:
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha57-r1.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha57-r1.ebuild
deleted file mode 100644
index 9940f0af483b..000000000000
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha57-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2009 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_alpha57-r1.ebuild,v 1.8 2009/06/11 05:42:10 jer Exp $
-
-EAPI=2
-
-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 acl"
-
-DEPEND="acl? ( sys-apps/acl )
- !app-cdr/dvdrtools
- !app-cdr/cdrkit"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-2.01.01
-
-src_prepare() {
- #"Adjust paths. Upstream is clearly on drugs, hardcoding paths into .c files.
- 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"
-
- sed -i -e "s:\(^INSDIR=\t\tshare/doc/\):\1${PF}/:" \
- $(grep -l -r 'INSDIR.\+doc' .) \
- || die "404 on doc sed"
-
- # Upstream should be hanged from the yardarm, possibly keelhauled for
- # not respecting libdir.
- sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \
- $(grep -l -r '^INSDIR.\+lib\(/siconv\)\?$' .) \
- || die "404 on multilib-sed"
-
- # See previous comment s/libdir/--disable-static/
- sed -i -e 's:include\t\t.*rules.lib::' \
- $(grep -l -r '^include.\+rules\.lib' .) \
- || die "404 on rules sed"
- #Remove profiled make files (wtf?)
- rm -f $(find . -name '*_p.mk') || die "rm failed"
-
- epatch "${FILESDIR}"/${PN}-2.01.01a03-warnings.patch
- epatch "${FILESDIR}"/${PN}-2.01.01_alpha50-asneeded.patch
-
- #Schily make setup
- cd "${S}"/DEFAULTS
- local MYARCH="linux"
-
- sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH} || die "sed schily-opt failed"
- sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH} || die "sed linux-include failed"
- sed -i "/RUNPATH/ c\RUNPATH= " Defaults.${MYARCH} || die "sed RUNPATH failed"
-
- # For dynamic linking:
- sed -i "s:static:dynamic:" Defaults.${MYARCH} || die "sed static-remove failed"
-
- # 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_configure() { : ; }
-
-src_compile() {
- local ACL="-lacl"
- 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 acl
- then
- CFLAGS="${CFLAGS} -DNO_ACL"
- ACL=""
- fi
- #If not built with -j1, "sometimes" cdda2wav will not be built. Nasty bug.
- emake -j1 CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" LIB_ACL_TEST="${ACL}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
- emake -j1 MANDIR="share/man" INS_BASE="${D}/usr/" INS_RBASE="${D}" install
-
- #These symlinks are for compat with cdrkit.
- dosym schily /usr/include/scsilib
- dosym ../scg /usr/include/schily/scg
-
- dodoc ABOUT Changelog README README.linux-shm START READMEs/README.linux || die "dodoc cdrtools"
-
- cd "${S}"/cdda2wav
- docinto cdda2wav
- dodoc FAQ Frontends HOWTOUSE TODO || die "dodoc cdda2wav"
-
-}
-
-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/cdrtools-2.01.01_alpha77.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha79.ebuild
index 09a3f1691d16..bc5d0a0b2c5c 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha77.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha79.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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_alpha77.ebuild,v 1.3 2010/04/27 20:27:26 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha79.ebuild,v 1.1 2010/05/18 18:59:25 billie Exp $
EAPI=2
@@ -44,6 +44,7 @@ src_prepare() {
$(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"
@@ -74,7 +75,6 @@ src_prepare() {
sed -i \
-e "s:/opt/schily:/usr:g" \
-e "s:/usr/src/linux/include::g" \
- -e "/RUNPATH/ c\RUNPATH= " \
-e "s:bin:root:g" \
Defaults.${os} || die "sed Schily make setup"
}
@@ -96,16 +96,20 @@ src_compile() {
CFLAGS="${CFLAGS} -DNO_ACL"
fi
- # If not built with -j1, "sometimes" cdda2wav will not be built. Bug?
+ # LIB_ACL_TEST removed to support x86-fbsd
+ # If not built with -j1, "sometimes" cdda2wav will not be built.
emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
- LDOPTX="${LDFLAGS}" LINKMODE="dynamic" \
- GMAKE_NOWARN="true" || die "emake"
+ LDOPTX="${LDFLAGS}" \
+ INS_BASE="${D}/usr" INS_RBASE="${D}" LINKMODE="dynamic" \
+ RUNPATH="" GMAKE_NOWARN="true" || die "emake"
}
src_install() {
- # If not built with -j1, "sometimes" manpages are not installed. Bug?
- emake -j1 INS_BASE="${D}/usr/" INS_RBASE="${D}" MANDIR="share/man" \
- LINKMODE="dynamic" GMAKE_NOWARN="true" install || die "emake install"
+ # If not built with -j1, "sometimes" manpages are not installed.
+ emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
+ LDOPTX="${LDFLAGS}" \
+ INS_BASE="${D}/usr" INS_RBASE="${D}" LINKMODE="dynamic" \
+ RUNPATH="" GMAKE_NOWARN="true" install || die "emake install"
# These symlinks are for compat with cdrkit.
dosym schily /usr/include/scsilib || die "dosym scsilib"
diff --git a/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha34-asneeded.patch b/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha34-asneeded.patch
deleted file mode 100644
index 90fb1664ebaa..000000000000
--- a/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha34-asneeded.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/libfind_p.mk cdrtools-2.01.01/libfind/libfind_p.mk
---- cdrtools-2.01.01.orig/libfind/libfind_p.mk 2007-06-30 14:13:34.000000000 +0300
-+++ cdrtools-2.01.01/libfind/libfind_p.mk 2007-08-28 22:34:04.000000000 +0300
-@@ -22,7 +22,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
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
deleted file mode 100644
index 3edf55d5136a..000000000000
--- a/app-cdr/cdrtools/files/cdrtools-2.01.01_alpha50-asneeded.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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_TEST)
-
- ###########################################################################
- 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_TEST)
-
- ###########################################################################
- include $(SRCROOT)/$(RULESDIR)/rules.shl
diff --git a/app-cdr/cdrtools/files/cdrtools-2.01.01a03-warnings.patch b/app-cdr/cdrtools/files/cdrtools-2.01.01a03-warnings.patch
deleted file mode 100644
index 86aaad40fecb..000000000000
--- a/app-cdr/cdrtools/files/cdrtools-2.01.01a03-warnings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- cdrtools-2.01.01/RULES/mk-gmake.id.warnings 2005-07-22 16:01:01.000000000 +0200
-+++ cdrtools-2.01.01/RULES/mk-gmake.id 2005-07-22 16:05:27.000000000 +0200
-@@ -30,7 +30,7 @@
-
- ifndef ARCH_DONE
-
--__gmake_warn:= $(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 2)
-+#__gmake_warn:= $(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 2)
-
- _MACHCMD= (mach || uname -p || true) 2> /dev/null
- _ARCHCMD= (arch || /usr/ucb/arch || true) 2> /dev/null
---- cdrtools-2.01.01/cdrecord/cdrecord.c.warnings 2005-07-22 16:01:01.000000000 +0200
-+++ cdrtools-2.01.01/cdrecord/cdrecord.c 2005-07-22 16:01:01.000000000 +0200
-@@ -4894,6 +4894,8 @@
- #ifdef HAVE_UNAME
- struct utsname un;
-
-+ /* Try not to break the diff for each cdrecord release */
-+ return;
- if (uname(&un) >= 0) {
- /*
- * I really hope that the Linux kernel developers will soon