Use virtual/acl to support x86-freebsd. Thanks to Alexis Ballier on irc.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index f5a3b52b76b1bfd4ab2c9f4b9910f8d261f21640..a0adde4a81f6ac2c33834508921c6da356f38bb7 100644 (file)
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,10 @@
 # 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.257 2010/04/27 19:08:13 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.258 2010/04/27 20:27:26 billie Exp $
+
+  27 Apr 2010; Daniel Pielmeier <billie@gentoo.org>
+  cdrtools-2.01.01_alpha77.ebuild, cdrtools-2.01.01_alpha78.ebuild:
+  Use virtual/acl to support x86-freebsd. Thanks to Alexis Ballier on irc.
 
   27 Apr 2010; Daniel Pielmeier <billie@gentoo.org>
   -cdrtools-2.01.01_alpha76.ebuild:

diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index a0834edf8bd7ad696a3a129a5dbb7f8a812357a0..b14a1e424575954ee9e074ecd43dc3b5dc78c8c2 100644 (file)
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -7,7 +7,7 @@ DIST cdrtools-2.01.01a77.tar.bz2 1925222 RMD160 0fee3b8c9fab0462f9fd7dd4ed965a01
 DIST cdrtools-2.01.01a78.tar.bz2 1928976 RMD160 8fcaf22c1032e1cc88426804530ee6f971b6625e SHA1 39643e00a37b1a2c38e6190675251b793ca97225 SHA256 7a7a2a56c5d8cd978bb12a78347c43595252b2808bacc17712853f17e3ed2e2c
 EBUILD cdrtools-2.01.01_alpha57-r1.ebuild 3741 RMD160 e33768607c3eb47dac4c0d0316404fcab34bad3e SHA1 3b34dde1f622724ba233b10a3b1d8947c11c2e45 SHA256 cc9c4ea9e7f580b91d4d6b19254a309bb8599d2ea1596a16a249101f6fd10943
 EBUILD cdrtools-2.01.01_alpha75.ebuild 3912 RMD160 ac0e708d1308a71d0f0a8e5d21e438215038b743 SHA1 364dd394f9f8167daf4359ed9c5b97556b17877a SHA256 35567236d5fb927603879678b1051e60a0839bf7b24f83f90bb3083a99feedc7
-EBUILD cdrtools-2.01.01_alpha77.ebuild 3930 RMD160 b7d02506901723b39314a83df92d7a2211d8bf7c SHA1 3df54b65daa273bf8f499929f39e379a33884d48 SHA256 fb23ff3e2e3514fc4655c581ef84ca49a903a30f253db8e80347dd6c1e163ea9
-EBUILD cdrtools-2.01.01_alpha78.ebuild 3928 RMD160 b343fb133c592e985785f12c5bed101acedf3c34 SHA1 e4d2d201dd822d5b838238a7919d0a26c060d093 SHA256 af8512d9b3c5d21939215a68650b96679a83238d624371fbef02e01462a1cb3f
-MISC ChangeLog 40232 RMD160 89b003fd39f7a695952beb2a4189e7cb08e2dc0f SHA1 e40a8964500f1b7f7e039e338a54dd842556a820 SHA256 2f17a1067fec1ea4c10b63da42710b471c24350869bbad7a5c94ebdceff7fe43
+EBUILD cdrtools-2.01.01_alpha77.ebuild 3875 RMD160 d204c3ac6c084115ae9d117dfec99419b174e018 SHA1 cf1ec90e44f86e9751a05a3db741f56f5e725b29 SHA256 af0515f4f2b9859e080127ef16f4a808a5ddfc35e6f66fc4105a46ea6b665d65
+EBUILD cdrtools-2.01.01_alpha78.ebuild 3875 RMD160 ec09b5946603df358b146c109bc9dc600097c813 SHA1 bac93beac90f9a25e588131dd74e3126a2e5d488 SHA256 ad8e92335dc9cc37fed0279d292f935d88f0a9440eccae1a5f2c519263b8e83d
+MISC ChangeLog 40428 RMD160 d50c2b02e2eed096edb86f88201c30002933d5fc SHA1 d345597e8907bb5b0f5cd1d2f53dbf8424e0c59a SHA256 ebaddf982cfcd9f76c09f7f2f6816cb217396d147c39b00392a488ab4b4e9387
 MISC metadata.xml 344 RMD160 a34ca9abb9d6e97a232f4b7d183e5350bbf2c978 SHA1 4f4dd69accee941e41b7d46e9038c50dce8e534f SHA256 1827502e9d2cfa583db6a17f065462b760bf3770fcac22a0145d6a560b2b34f8

diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha77.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha77.ebuild
index 7eea3f5b4e5a85593f37fb6f8b47e5cf41916486..09a3f1691d166b93deab2b70072bfcedc1fa887d 100644 (file)
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha77.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha77.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.2 2010/03/16 10:58:41 aballier Exp $
+# $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 $
 
 EAPI=2
 
@@ -8,7 +8,7 @@ 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/private/cdrecord.html"
-if [[ ${PV%_alpha*} == ${PV} ]] ; then
+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"
@@ -19,7 +19,7 @@ SLOT="0"
 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 )
        !app-cdr/dvdrtools
        !app-cdr/cdrkit"
 RDEPEND="${DEPEND}"
@@ -62,7 +62,7 @@ src_prepare() {
 
        # Create additional symlinks needed for some archs.
        local t
-       for t in ppc64 s390x ; do
+       for t in 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
@@ -92,16 +92,13 @@ 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?
        emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
-               LDOPTX="${LDFLAGS}" LINKMODE="dynamic" LIB_ACL_TEST="${acl}" \
+               LDOPTX="${LDFLAGS}" LINKMODE="dynamic" \
                GMAKE_NOWARN="true" || die "emake"
 }
 

diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild
index a82c278bd366ae7fdbdd8ae5f91f76b91a7ed24c..357e8fb14e196834e82a0e685fb0109c6626fdb3 100644 (file)
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.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_alpha78.ebuild,v 1.1 2010/04/27 19:06:18 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha78.ebuild,v 1.2 2010/04/27 20:27:26 billie Exp $
 
 EAPI=2
 
@@ -8,7 +8,7 @@ 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/private/cdrecord.html"
-if [[ ${PV%_alpha*} == ${PV} ]] ; then
+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"
@@ -19,7 +19,7 @@ SLOT="0"
 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 )
        !app-cdr/dvdrtools
        !app-cdr/cdrkit"
 RDEPEND="${DEPEND}"
@@ -62,7 +62,7 @@ src_prepare() {
 
        # Create additional symlinks needed for some archs.
        local t
-       for t in ppc64 s390x ; do
+       for t in 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
@@ -92,16 +92,13 @@ 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?
        emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
-               LDOPTX="${LDFLAGS}" LINKMODE="dynamic" LIB_ACL_TEST="${acl}" \
+               LDOPTX="${LDFLAGS}" LINKMODE="dynamic" \
                GMAKE_NOWARN="true" || die "emake"
 }