Add a gdbm USE flag to switch on or off GDBM as database provider (use simple otherwise); this allows fixing (a bit) the license handling, as GDBM makes the whole package GPL-2. Also remove two wrong restrictions in the USE flag description.

(Portage version: 2.2.0_alpha92/cvs/Linux x86_64)

4 files changed, 51 insertions, 15 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 26c110ff05e5..0c316ce6484a 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.264 2012/03/13 14:48:28 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.265 2012/03/20 23:49:11 flameeyes Exp $
+
+  20 Mar 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml,
+  pulseaudio-1.1-r1.ebuild, pulseaudio-9999.ebuild:
+  Add a gdbm USE flag to switch on or off GDBM as database provider (use simple
+  otherwise); this allows fixing (a bit) the license handling, as GDBM makes the
+  whole package GPL-2. Also remove two wrong restrictions in the USE flag
+  description.
 
   13 Mar 2012; Arun Raghavan <ford_prefect@gentoo.org> pulseaudio-9999.ebuild:
   Make alsa-plugins a PDEPEND to avoid circular deps.
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 665d228b47d5..7f6bf29c1a1c 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -41,15 +41,20 @@
       Makes PulseAudio use RealtimeKit (<pkg>sys-auth/rtkit</pkg>) to get
       real-time priority while running.
     </flag>
-    <flag name="equalizer" restrict="=media-sound/pulseaudio-9999">
+    <flag name="equalizer">
       Enable the equalizer module (requires <pkg>sci-libs/fftw</pkg>).
     </flag>
-    <flag name="orc" restrict="=media-sound/pulseaudio-9999">
+    <flag name="orc">
       Use <pkg>dev-lang/orc</pkg> for runtime optimisations.
     </flag>
     <flag name="ssl">
       Use <pkg>dev-libs/openssl</pkg> to provide support for RAOP
       (AirPort) streaming.
     </flag>
+    <flag name="gdbm">
+      Use <pkg>sys-libs/gdbm</pkg> to store PulseAudio
+      databases. Recommended for desktop usage. This flag causes the
+      whole package to be licensed under GPL-2 or later.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild
index d7dac6126d27..74c729e28359 100644
--- a/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild,v 1.10 2012/03/12 07:13:04 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-1.1-r1.ebuild,v 1.11 2012/03/20 23:49:11 flameeyes Exp $
 
 EAPI=4
 
@@ -11,10 +11,14 @@ HOMEPAGE="http://www.pulseaudio.org/"
 
 SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 
-LICENSE="LGPL-2 GPL-2"
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl"
+IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl +gdbm"
 
 RDEPEND="app-admin/eselect-esd
 	X? (
@@ -47,7 +51,7 @@ RDEPEND="app-admin/eselect-esd
 	ssl? ( dev-libs/openssl )
 	>=media-libs/speex-1.2_rc1
 	>=media-libs/libsndfile-1.0.20
-	sys-libs/gdbm
+	gdbm? ( sys-libs/gdbm )
 	dev-libs/json-c
 	>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
 
@@ -94,6 +98,14 @@ src_configure() {
 	# proper dependency and fix this up. — flameeyes
 	append-ldflags $(no-as-needed)
 
+	if use gdbm; then
+		myconf+=" --with-database=gdbm"
+	#elif use tdb; then
+	#	myconf+=" --with-database=tdb"
+	else
+		myconf+=" --with-database=simple"
+	fi
+
 	econf \
 		--enable-largefile \
 		$(use_enable glib glib2) \
@@ -119,8 +131,8 @@ src_configure() {
 		$(use_with caps) \
 		$(use_with equalizer fftw) \
 		--localstatedir="${EPREFIX}"/var \
-		--with-database=gdbm \
-		--with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d"
+		--with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d" \
+		${myconf}
 
 	if use doc; then
 		pushd doxygen
diff --git a/media-sound/pulseaudio/pulseaudio-9999.ebuild b/media-sound/pulseaudio/pulseaudio-9999.ebuild
index d5c49f526a13..e7d86af80620 100644
--- a/media-sound/pulseaudio/pulseaudio-9999.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.19 2012/03/13 14:48:28 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-9999.ebuild,v 1.20 2012/03/20 23:49:11 flameeyes Exp $
 
 EAPI=4
 
@@ -11,10 +11,14 @@ HOMEPAGE="http://www.pulseaudio.org/"
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/pulseaudio/pulseaudio.git"
 
-LICENSE="LGPL-2 GPL-2"
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 SLOT="0"
 KEYWORDS=""
-IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl"
+IUSE="+alsa avahi +caps equalizer jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6 system-wide realtime +orc ssl +gdbm"
 
 RDEPEND=">=media-libs/libsndfile-1.0.20
 	X? (
@@ -46,7 +50,7 @@ RDEPEND=">=media-libs/libsndfile-1.0.20
 	orc? ( >=dev-lang/orc-0.4.9 )
 	ssl? ( dev-libs/openssl )
 	>=media-libs/speex-1.2_rc1
-	sys-libs/gdbm
+	gdbm? ( sys-libs/gdbm )
 	dev-libs/json-c
 	>=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
 
@@ -90,6 +94,14 @@ src_configure() {
 	# proper dependency and fix this up. — flameeyes
 	append-ldflags $(no-as-needed)
 
+	if use gdbm; then
+		myconf+=" --with-database=gdbm"
+	#elif use tdb; then
+	#	myconf+=" --with-database=tdb"
+	else
+		myconf+=" --with-database=simple"
+	fi
+
 	econf \
 		--enable-largefile \
 		$(use_enable glib glib2) \
@@ -116,8 +128,8 @@ src_configure() {
 		$(use_with equalizer fftw) \
 		--disable-esound \
 		--localstatedir="${EPREFIX}"/var \
-		--with-database=gdbm \
-		--with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d"
+		--with-udev-rules-dir="${EPREFIX}/lib/udev/rules.d" \
+		${myconf}
 
 	if use doc; then
 		pushd doxygen