Use 'caps' use flag to toggle linkage against libcap. Fixup automagic linkage of libacl and libcap in 3.01_alpha27.

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

4 files changed, 20 insertions, 20 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 765ce7f98565..2bf244a33ad0 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.349 2015/02/18 15:33:08 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.350 2015/02/19 03:08:59 floppym Exp $
+
+  19 Feb 2015; Mike Gilbert <floppym@gentoo.org> cdrtools-3.01_alpha17.ebuild,
+  cdrtools-3.01_alpha24.ebuild, cdrtools-3.01_alpha27.ebuild:
+  Use 'caps' use flag to toggle linkage against libcap. Fixup automagic linkage
+  of libacl and libcap in 3.01_alpha27.
 
   18 Feb 2015; Rick Farina <zerochaos@gentoo.org> cdrtools-3.01_alpha17.ebuild,
   cdrtools-3.01_alpha24.ebuild, cdrtools-3.01_alpha27.ebuild:
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild
index c63bc33bd97a..f6119a485427 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild,v 1.19 2015/02/18 15:33:08 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild,v 1.20 2015/02/19 03:08:59 floppym Exp $
 
 EAPI=5
 
@@ -15,10 +15,10 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
 KEYWORDS="alpha amd64 arm 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"
+IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
-	filecaps? ( sys-libs/libcap )
+	caps? ( sys-libs/libcap )
 	nls? ( virtual/libintl )
 	!app-cdr/cdrkit"
 DEPEND="${RDEPEND}
@@ -111,7 +111,7 @@ src_compile() {
 		fi
 	fi
 
-	if ! use filecaps; then
+	if ! use caps; then
 		CFLAGS="${CFLAGS} -DNO_LINUX_CAPS"
 	fi
 
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
index 15d03cf3a28e..68606ac9441f 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild,v 1.5 2015/02/18 15:33:08 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild,v 1.6 2015/02/19 03:08:59 floppym Exp $
 
 EAPI=5
 
@@ -15,10 +15,10 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 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"
+IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
-	filecaps? ( sys-libs/libcap )
+	caps? ( sys-libs/libcap )
 	nls? ( virtual/libintl )
 	!app-cdr/cdrkit"
 DEPEND="${RDEPEND}
@@ -218,7 +218,7 @@ src_compile() {
 		fi
 	fi
 
-	if ! use filecaps; then
+	if ! use caps; then
 		CFLAGS="${CFLAGS} -DNO_LINUX_CAPS"
 	fi
 
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild
index 1233ef958e6b..656264834819 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild,v 1.2 2015/02/18 15:33:08 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha27.ebuild,v 1.3 2015/02/19 03:08:59 floppym Exp $
 
 EAPI=5
 
@@ -15,10 +15,10 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 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"
+IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
-	filecaps? ( sys-libs/libcap )
+	caps? ( sys-libs/libcap )
 	nls? ( virtual/libintl )
 	!app-cdr/cdrkit"
 DEPEND="${RDEPEND}
@@ -129,6 +129,9 @@ ac_cv_sizeof() {
 }
 
 src_configure() {
+	use acl || export ac_cv_header_sys_acl_h="no"
+	use caps || export ac_cv_lib_cap_cap_get_proc="no"
+
 	# skip obsolete configure script
 	if tc-is-cross-compiler ; then
 		# Cache known values for targets. #486680
@@ -218,14 +221,6 @@ src_compile() {
 		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"