diff options
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/cdrtools/ChangeLog | 10 | ||||
| -rw-r--r-- | app-cdr/cdrtools/Manifest | 6 | ||||
| -rw-r--r-- | app-cdr/cdrtools/cdrtools-3.01_alpha02.ebuild (renamed from app-cdr/cdrtools/cdrtools-2.01.01_alpha75.ebuild) | 49 |
3 files changed, 36 insertions, 29 deletions
diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog index c55fd385e90a..13a391cdf213 100644 --- a/app-cdr/cdrtools/ChangeLog +++ b/app-cdr/cdrtools/ChangeLog @@ -1,6 +1,12 @@ # 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.275 2010/12/05 17:50:51 armin76 Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.276 2011/01/10 20:23:46 billie Exp $ + +*cdrtools-3.01_alpha02 (10 Jan 2011) + + 10 Jan 2011; Daniel Pielmeier <billie@gentoo.org> + -cdrtools-2.01.01_alpha75.ebuild, +cdrtools-3.01_alpha02.ebuild: + Version bump. Remove old. 05 Dec 2010; Raúl Porcel <armin76@gentoo.org> cdrtools-3.00.ebuild: ia64/s390/sh stable wrt #328163 diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest index 81b6cd1cee87..0400bb7303d2 100644 --- a/app-cdr/cdrtools/Manifest +++ b/app-cdr/cdrtools/Manifest @@ -1,8 +1,8 @@ -DIST cdrtools-2.01.01a75.tar.bz2 1922616 RMD160 784e6ffda7082f9a1f25c67647a148271445ab40 SHA1 eaef1c4b20763301e1c10139ad51923bb161de3e SHA256 49c84695ab01c4b34df7405bcdadb64b244dcccac7908dbcb97972f623ba23fe DIST cdrtools-3.00.tar.bz2 1978563 RMD160 210684ab5e286ef59b788b49bd0b74d88f6435f4 SHA1 6464844d6b936d4f43ee98a04d637cd91131de4e SHA256 7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d DIST cdrtools-3.01a01.tar.bz2 1991101 RMD160 798f388f9dcf8dffc60fed78e6420b6cd275d205 SHA1 50003be7e640d6c876a70e0144388755c2973fc8 SHA256 a59720c621508303aa938596cf03b80e3d583d7cc5c4bbbaeece98064fab4ab2 -EBUILD cdrtools-2.01.01_alpha75.ebuild 4076 RMD160 5a12972583bba4093a8676ff74b46e75fa4309b3 SHA1 90c1c82e068233a7dcc49789f4faa6b33ade008e SHA256 9156e314e8a4ae5d4ef9b51fca6e1ebd15bdcedaa3a2568005566b418f61e31d +DIST cdrtools-3.01a02.tar.bz2 1994677 RMD160 6b1876b1d9a5fa000229a7187d72b13dcf6971bf SHA1 36b318a913d0db6cc86940a0ad6e2adea19b3324 SHA256 1c63195e57c2855463b226ab8afdc6665717f948d8c004208f4e27d81fd8f597 EBUILD cdrtools-3.00.ebuild 4067 RMD160 6f155cb16b29dcd31b500622f88f9d0e1919d3ce SHA1 59c66ba6567aad7ea6fb776b696d1ffcc8c6a39a SHA256 664e5adb7ab7a7b41992b98633b0f31b1f24745b01c525aa20db6bf0e1493f3a EBUILD cdrtools-3.01_alpha01.ebuild 4169 RMD160 e6a5fc4ce692c9d1494788d0263a21b9f0e2f9fd SHA1 d3357e93e0c4fee4b1514af8f75e5a43807f5d22 SHA256 55a509c8a7d692f1e3b8e9cfd999cb8d8992855e0ad954954da6645d7dc6445c -MISC ChangeLog 42842 RMD160 6a8503c7a8a6c8392c46f01ff7f044ecf92fd38c SHA1 9830cb6755d5b2ada609b45f5923064f26fbb72a SHA256 39ab51a92fc2a41ec95a23e393eccbe503d180746a7ec6b4b8289e78bec27a97 +EBUILD cdrtools-3.01_alpha02.ebuild 4199 RMD160 05953c1ec456e1d5d34cc2a54aa24eef1c4de860 SHA1 1c866864e47113824cad1919fd19b3473d98b4cf SHA256 6dad33b42fa564051ca99ae84b7b0f9a9db6650a0557b36de172515e8aae6414 +MISC ChangeLog 43027 RMD160 50ae9c474c90cf82d0492237ab4e6551bbf6fe7e SHA1 78d3f9405289b04ac6aa6f0c06f37826260e8796 SHA256 3907145097be95bc44a1731f57ecb4577d262f53a7268c3ea0429fe36504f8c6 MISC metadata.xml 344 RMD160 a34ca9abb9d6e97a232f4b7d183e5350bbf2c978 SHA1 4f4dd69accee941e41b7d46e9038c50dce8e534f SHA256 1827502e9d2cfa583db6a17f065462b760bf3770fcac22a0145d6a560b2b34f8 diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha75.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha02.ebuild index 0b022b3d074a..907b389377b3 100644 --- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha75.ebuild +++ b/app-cdr/cdrtools/cdrtools-3.01_alpha02.ebuild @@ -1,25 +1,24 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 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_alpha75.ebuild,v 1.8 2010/05/18 19:16:13 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha02.ebuild,v 1.1 2011/01/10 20:23:46 billie Exp $ EAPI=2 inherit 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" -if [[ ${PV%_alpha*} == ${PV} ]] ; then -SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/${P}.tar.bz2" -else -SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2" -fi +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" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="acl unicode" -DEPEND="acl? ( sys-apps/acl ) +DEPEND="acl? ( virtual/acl ) + >=sys-devel/gettext-0.18.1.1 !app-cdr/dvdrtools !app-cdr/cdrkit" RDEPEND="${DEPEND}" @@ -44,6 +43,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" @@ -60,9 +60,9 @@ src_prepare() { 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. + # Create additional symlinks needed for some archs (armv4l already created) local t - for t in ppc64 s390x ; do + for t in armv4tl armv5l armv5tel armv6l 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 @@ -74,11 +74,11 @@ 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" } +# skip obsolete configure script src_configure() { : ; } src_compile() { @@ -92,26 +92,24 @@ src_compile() { fi fi - local acl="-lacl" - if ! use acl - then + if ! use acl; then CFLAGS="${CFLAGS} -DNO_ACL" - 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}" LIB_ACL_TEST="${acl}" \ - INS_BASE="${D}/usr/" INS_RBASE="${D}" MANDIR="share/man" \ - 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? + # If not built with -j1, "sometimes" manpages are not installed. emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \ - LDOPTX="${LDFLAGS}" LIB_ACL_TEST="${acl}" \ - INS_BASE="${D}/usr/" INS_RBASE="${D}" MANDIR="share/man" \ - LINKMODE="dynamic" GMAKE_NOWARN="true" install || die "emake install" + 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" @@ -128,4 +126,7 @@ src_install() { cd "${S}"/mkisofs docinto mkisofs dodoc ChangeLog* TODO || die "dodoc mkisofs" + + # Remove man pages related to the build system + rm -rvf "${D}"/usr/share/man/man5 } |