Make optional deps configurable.

Package-Manager: portage-2.1.3.9

6 files changed, 147 insertions, 47 deletions

diff --git a/net-p2p/museek+/ChangeLog b/net-p2p/museek+/ChangeLog
index da1964daf709..35aad70eca39 100644
--- a/net-p2p/museek+/ChangeLog
+++ b/net-p2p/museek+/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/museek+
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/ChangeLog,v 1.6 2007/09/22 19:26:08 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/ChangeLog,v 1.7 2007/09/23 12:20:22 coldwind Exp $
+
+*museek+-0.1.13-r1 (23 Sep 2007)
+
+  23 Sep 2007; Santiago M. Mola <coldwind@gentoo.org>
+  +files/museek+-0.1.13-optional-deps.patch,
+  files/museek+-0.1.13-post_release_fixes.patch, -museek+-0.1.13.ebuild,
+  +museek+-0.1.13-r1.ebuild:
+  Make optional deps configurable.
 
 *museek+-0.1.13 (22 Sep 2007)
 
diff --git a/net-p2p/museek+/Manifest b/net-p2p/museek+/Manifest
index 5f99e4c24e91..f1e33839e137 100644
--- a/net-p2p/museek+/Manifest
+++ b/net-p2p/museek+/Manifest
@@ -14,24 +14,28 @@ AUX museek+-0.1.12-scons-0.96.94.patch 7755 RMD160 42e807f95d9453a9353c30934670c
 MD5 f55fea99d9b62eee323d07bd56e0fd22 files/museek+-0.1.12-scons-0.96.94.patch 7755
 RMD160 42e807f95d9453a9353c30934670c3ff8d1f013a files/museek+-0.1.12-scons-0.96.94.patch 7755
 SHA256 3c1bc12262dd01f441a891c9f33db09368cab02842ebcaa33839810fdde73cf0 files/museek+-0.1.12-scons-0.96.94.patch 7755
-AUX museek+-0.1.13-post_release_fixes.patch 7026 RMD160 e1a4f62dbcd9d6e51061bdf255e45faed3ee6ca1 SHA1 af3abc48b8326a9f945a602d6c84b10758a413e3 SHA256 447fa903f14c99a78644a7389497919471254578ef6aaade8f90470aa595dc2e
-MD5 f04ea07cf8f97d2d21a1b246fc924326 files/museek+-0.1.13-post_release_fixes.patch 7026
-RMD160 e1a4f62dbcd9d6e51061bdf255e45faed3ee6ca1 files/museek+-0.1.13-post_release_fixes.patch 7026
-SHA256 447fa903f14c99a78644a7389497919471254578ef6aaade8f90470aa595dc2e files/museek+-0.1.13-post_release_fixes.patch 7026
+AUX museek+-0.1.13-optional-deps.patch 2982 RMD160 fb285a39b704e7fb841c0319a744a870c6014740 SHA1 35d23e5347bf1971b27e6cfea2f2e891d143be89 SHA256 058496ff74454995dfef8c93775fe89a9008af3d97c327e040ca16b0eaa9d94d
+MD5 71180283bdf20450127c600d055d7d6b files/museek+-0.1.13-optional-deps.patch 2982
+RMD160 fb285a39b704e7fb841c0319a744a870c6014740 files/museek+-0.1.13-optional-deps.patch 2982
+SHA256 058496ff74454995dfef8c93775fe89a9008af3d97c327e040ca16b0eaa9d94d files/museek+-0.1.13-optional-deps.patch 2982
+AUX museek+-0.1.13-post_release_fixes.patch 6801 RMD160 d039d8c09241dab2e93a082817197d7c14ba6212 SHA1 4ef183c740df67b8b5347083504c027586885899 SHA256 a99b83a517061efe7d1d027f669e903eb66a7be4590ade5bacfdc5523d2826ae
+MD5 a18633c094ac149b1a6eb4ea4bd2e66b files/museek+-0.1.13-post_release_fixes.patch 6801
+RMD160 d039d8c09241dab2e93a082817197d7c14ba6212 files/museek+-0.1.13-post_release_fixes.patch 6801
+SHA256 a99b83a517061efe7d1d027f669e903eb66a7be4590ade5bacfdc5523d2826ae files/museek+-0.1.13-post_release_fixes.patch 6801
 DIST museek+-0.1.12.tar.bz2 758908 RMD160 2be013e1c27e846b29ff4d51c825fc0cda2f58e9 SHA1 8ec3aafdbd22a9ac143419bb5c1296635be76ad9 SHA256 458a6d98cfec13c416382df32c99ff7862d70f54bc94ff3ad1cdb0723a7b3a53
 DIST museek+-0.1.13.tar.bz2 1186870 RMD160 25e1febce98ee536ba380e58b052ed7113f84d06 SHA1 003cc4f7d98b8bce8cdfa969b370a5e3c10ca9a1 SHA256 e1958556b30dee59eb7648973432d4d048f30c79f38ab7145fca6f0f2690473e
 EBUILD museek+-0.1.12.ebuild 2475 RMD160 1bc318fb878c23759658340bb0fc49ad62740d36 SHA1 81d7f4345ef621018ea5c89a53b1cce2a396a98b SHA256 772d3ef3b982612da433bac90447daad81611b1b218dda80cdb2115f16c689b0
 MD5 813b92f31f30b15c38a62f9c940d988c museek+-0.1.12.ebuild 2475
 RMD160 1bc318fb878c23759658340bb0fc49ad62740d36 museek+-0.1.12.ebuild 2475
 SHA256 772d3ef3b982612da433bac90447daad81611b1b218dda80cdb2115f16c689b0 museek+-0.1.12.ebuild 2475
-EBUILD museek+-0.1.13.ebuild 2379 RMD160 47a0e33887adbca7a2c18daba1c2b6194928b6b6 SHA1 17230a49a24a174ada9f0314aaa54ab2e8dff983 SHA256 d06cf1d6f34f662dfdea0be6b24fdc9291aa2e111965491092f146538cab4f25
-MD5 d993d9833a85116d79abcf864a90b5c7 museek+-0.1.13.ebuild 2379
-RMD160 47a0e33887adbca7a2c18daba1c2b6194928b6b6 museek+-0.1.13.ebuild 2379
-SHA256 d06cf1d6f34f662dfdea0be6b24fdc9291aa2e111965491092f146538cab4f25 museek+-0.1.13.ebuild 2379
-MISC ChangeLog 1249 RMD160 8f1e2cd9586704a5f083ace28dd6af99f9971e06 SHA1 63138f3d85bc2d5f7b3b195bb9580fa42b0af9d2 SHA256 88e29c0c1d0c300f127aecafb93367995b83242f8dbbdae480e448f66f2d35b8
-MD5 9fe81dbf306d9235137a8c75e9b55a63 ChangeLog 1249
-RMD160 8f1e2cd9586704a5f083ace28dd6af99f9971e06 ChangeLog 1249
-SHA256 88e29c0c1d0c300f127aecafb93367995b83242f8dbbdae480e448f66f2d35b8 ChangeLog 1249
+EBUILD museek+-0.1.13-r1.ebuild 2444 RMD160 fe3c15f07c27c8586eb7fa7316f6e121cff831d6 SHA1 e1b37f1196c76b38ed427fe0a4f4d013ba53d6f2 SHA256 f922a48c63fc76756b48adf601d8c145361ad14abe78671f06c6cef6de4fc997
+MD5 e27cb90ed601c1138357249d6718cae0 museek+-0.1.13-r1.ebuild 2444
+RMD160 fe3c15f07c27c8586eb7fa7316f6e121cff831d6 museek+-0.1.13-r1.ebuild 2444
+SHA256 f922a48c63fc76756b48adf601d8c145361ad14abe78671f06c6cef6de4fc997 museek+-0.1.13-r1.ebuild 2444
+MISC ChangeLog 1520 RMD160 896dd8e12fa5559d9b7645129271f9cc33f762af SHA1 ea3012a65af16514b553d700c91257a98f0ae863 SHA256 0b8ee8274783a8830abc0f94157e5ae694fe88316df9a017d06cf328d04a345b
+MD5 36ce806e3902eee1dd94259a27204a86 ChangeLog 1520
+RMD160 896dd8e12fa5559d9b7645129271f9cc33f762af ChangeLog 1520
+SHA256 0b8ee8274783a8830abc0f94157e5ae694fe88316df9a017d06cf328d04a345b ChangeLog 1520
 MISC metadata.xml 313 RMD160 b0805df315468fbaa87cfbf5f13bdf4e39dc46a9 SHA1 f3d60151d576d04d35a23a6abf18d91aa7dcf8a0 SHA256 8050a8119d7f3b6d1ae17c8f5d53c743a0dd78b74c506d9d5fee6cae94ed521f
 MD5 f8759be35c2bed29cb5cb729b8377d2f metadata.xml 313
 RMD160 b0805df315468fbaa87cfbf5f13bdf4e39dc46a9 metadata.xml 313
@@ -39,6 +43,6 @@ SHA256 8050a8119d7f3b6d1ae17c8f5d53c743a0dd78b74c506d9d5fee6cae94ed521f metadata
 MD5 c2fa9be1bc551c4ccad3b3ad223ce7be files/digest-museek+-0.1.12 247
 RMD160 b631e175011aed7ee2e4c56442c1a31a109132d0 files/digest-museek+-0.1.12 247
 SHA256 3a5376cf776176b2c8e76b558b0fbf15ef916756f984f8042779bae2d6569de6 files/digest-museek+-0.1.12 247
-MD5 e76a1fcced1acfdc800a08ed72d4ed68 files/digest-museek+-0.1.13 250
-RMD160 429240e5007a3f9de947fa3c596f4e1e756a3232 files/digest-museek+-0.1.13 250
-SHA256 bbe7f83ab932001afd23b1bd9ae9d25a63799eae62d7143cbf7e7351ab4d5360 files/digest-museek+-0.1.13 250
+MD5 e76a1fcced1acfdc800a08ed72d4ed68 files/digest-museek+-0.1.13-r1 250
+RMD160 429240e5007a3f9de947fa3c596f4e1e756a3232 files/digest-museek+-0.1.13-r1 250
+SHA256 bbe7f83ab932001afd23b1bd9ae9d25a63799eae62d7143cbf7e7351ab4d5360 files/digest-museek+-0.1.13-r1 250
diff --git a/net-p2p/museek+/files/digest-museek+-0.1.13 b/net-p2p/museek+/files/digest-museek+-0.1.13-r1
index 831269f7b4d6..831269f7b4d6 100644
--- a/net-p2p/museek+/files/digest-museek+-0.1.13
+++ b/net-p2p/museek+/files/digest-museek+-0.1.13-r1
diff --git a/net-p2p/museek+/files/museek+-0.1.13-optional-deps.patch b/net-p2p/museek+/files/museek+-0.1.13-optional-deps.patch
new file mode 100644
index 000000000000..c5f282cde693
--- /dev/null
+++ b/net-p2p/museek+/files/museek+-0.1.13-optional-deps.patch
@@ -0,0 +1,95 @@
+--- CMakeLists.txt	2007-09-23 13:10:33.000000000 +0200
++++ CMakeLists.txt	2007-09-23 13:14:32.000000000 +0200
+@@ -261,7 +261,7 @@
+ endif (NOT DIR_H)
+ 
+ # Detect Vorbisfile library
+-if (HAVE_VORBIS_H)
++if (HAVE_VORBIS_H AND VORBIS)
+   find_library(VORBIS_LIBRARIES NAMES vorbisfile PATHS /usr/lib /usr/local/lib)
+   if (VORBIS_LIBRARIES)
+     set(HAVE_VORBIS 1)
+@@ -270,9 +270,9 @@
+     message(STATUS "Vorbisfile library wasn't found, ogg metadata will not be created")
+     set(VORBIS_LIBRARIES "")
+   endif (VORBIS_LIBRARIES)
+-else (HAVE_VORBIS_H)
++else (HAVE_VORBIS_H AND VORBIS)
+   set(VORBIS_LIBRARIES "")
+-endif (HAVE_VORBIS_H)
++endif (HAVE_VORBIS_H AND VORBIS)
+ 
+ set(CMAKE_REQUIRED_LIBRARIES)
+ 
+@@ -340,4 +340,4 @@
+   add_subdirectory(museeq)
+ else (C_MUSEEQ)
+   message("!!! museeq will NOT be installed [NO_MUSEEQ=0]")
+-endif (C_MUSEEQ)
+\ No hay ningún carácter de nueva línea al final del fichero
++endif (C_MUSEEQ)
+--- museeq/CMakeLists.txt	2007-09-23 13:10:33.000000000 +0200
++++ museeq/CMakeLists.txt	2007-09-23 13:13:58.000000000 +0200
+@@ -1,9 +1,7 @@
+ project(museeq) # the name of your project
+ 
+ MESSAGE("DECLARATIONS: PREFIX (/usr), MANDIR (PREFIX/man), DATADIR (PREFIX/share), BINRELOC, TRAYICON
+-Prefix declarations with -D and set them with either 1, 0 or a path.
+-QSA is detected automatically
+-")
++Prefix declarations with -D and set them with either 1, 0 or a path.")
+ 
+ 
+ cmake_minimum_required(VERSION 2.4.0)
+@@ -175,13 +173,17 @@
+   int main() {
+      QSInterpreter::defaultInterpreter()->hasFunction(\"\");
+   }
+-" QSA)
++" HAVE_QSA)
+ 
+ if (QSA)
+-MESSAGE(STATUS "QSA available")
+- add_definitions(-DHAVE_QSA=1 -DHAVE_QSA_DIALOG=1 )
++  if (HAVE_QSA)
++    MESSAGE(STATUS "QSA available")
++    add_definitions(-DHAVE_QSA=1 -DHAVE_QSA_DIALOG=1 )
++  else (HAVE_QSA)
++    MESSAGE(FATAL_ERROR "!!! QSA NOT available")
++  endif (HAVE_QSA)
+ else (QSA)
+-MESSAGE("!!! QSA NOT available")
++MESSAGE("!!! QSA disabled")
+ endif (QSA)
+ 
+ message(STATUS "moc binary:" ${QT_MOC_EXECUTABLE})
+@@ -369,4 +371,4 @@
+   MESSAGE(" * without a Trayicon.. [TRAYICON=1]")
+ else (NOT TRAYICON)
+   MESSAGE(" * with a Trayicon.. [TRAYICON=0]")
+-endif (NOT TRAYICON)
+\ No hay ningún carácter de nueva línea al final del fichero
++endif (NOT TRAYICON)
+--- Tools/CMakeLists.txt	2007-09-23 13:10:33.000000000 +0200
++++ Tools/CMakeLists.txt	2007-09-23 13:11:55.000000000 +0200
+@@ -42,7 +42,7 @@
+ )
+ MESSAGE("--> muscan (file scanner) will be installed..")
+ # To build, or not build muscand
+-if (FAM_LIBRARIES AND FAM_H)
++if (NOT NO_MUSCAND AND FAM_LIBRARIES AND FAM_H)
+ 
+ add_executable(muscand ${MUSCAND_SOURCES})
+ 
+@@ -68,9 +68,9 @@
+   DESTINATION bin
+ )
+   MESSAGE("--> muscand (FAM-based file scanning daemon) will be installed..")
+-else(FAM_LIBRARIES AND FAM_H)
++else(NOT NO_MUSCAND AND FAM_LIBRARIES AND FAM_H)
+   MESSAGE("!!! muscand will NOT be installed..")
+-endif(FAM_LIBRARIES AND FAM_H)
++endif(NOT NO_MUSCAND AND FAM_LIBRARIES AND FAM_H)
+ 
+ target_link_libraries(
+   muscan
diff --git a/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch b/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch
index 6dd5df3cf77c..4c5be3ff1636 100644
--- a/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch
+++ b/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch
@@ -51,13 +51,6 @@ Index: museeq/CMakeLists.txt
  
  set(ICONS
    museeq.png
-@@ -369,4 +374,4 @@
-   MESSAGE(" * without a Trayicon.. [TRAYICON=1]")
- else (NOT TRAYICON)
-   MESSAGE(" * with a Trayicon.. [TRAYICON=0]")
--endif (NOT TRAYICON)
-\ Sin fin-de-línea al final del archivo
-+endif (NOT TRAYICON)
 Index: museeq/mainwin.cpp
 ===================================================================
 --- museeq/mainwin.cpp	(revisión: 735)
diff --git a/net-p2p/museek+/museek+-0.1.13.ebuild b/net-p2p/museek+/museek+-0.1.13-r1.ebuild
index cd87f88d2c77..b0696cd15d61 100644
--- a/net-p2p/museek+/museek+-0.1.13.ebuild
+++ b/net-p2p/museek+/museek+-0.1.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/museek+-0.1.13.ebuild,v 1.1 2007/09/22 19:26:08 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/museek+-0.1.13-r1.ebuild,v 1.1 2007/09/23 12:20:22 coldwind Exp $
 
 inherit qt3 eutils distutils multilib
 
@@ -11,15 +11,15 @@ SRC_URI="mirror://sourceforge/museek-plus/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="debug gtk ncurses qt3 trayicon"
+IUSE="debug fam gtk ncurses qsa qt3 trayicon vorbis"
 
 RDEPEND=">=dev-cpp/libxmlpp-1.0.2
-		gtk? ( >=dev-python/pygtk-2.6.1 )
-		qt3? ( $(qt_min_version 3.3)
-			>=dev-libs/qsa-1.1.1 )
-		media-libs/libvorbis
-		media-libs/libogg
-		virtual/fam"
+	gtk? ( >=dev-python/pygtk-2.6.1 )
+	qt3? ( $(qt_min_version 3.3) )
+	qsa? ( >=dev-libs/qsa-1.1.1 )
+	vorbis? ( media-libs/libvorbis
+		media-libs/libogg )
+	fam? ( virtual/fam )"
 DEPEND="${RDEPEND}
 		dev-lang/swig"
 
@@ -34,31 +34,31 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}/${P}-optional-deps.patch"
 	epatch "${FILESDIR}/${P}-post_release_fixes.patch"
 	sed -i -e "s:join('lib':join('$(get_libdir)':g" \
 		*/CMakeLists.txt || die "sed failed"
 }
 
+my_use() {
+	use $1 && echo "1" || echo "0"
+}
+
+my_not_use() {
+	use $1 && echo "0" || echo "1"
+}
+
 src_compile() {
 	# Build museekd, mucous, murmur, python bindings and clients
 	local myconf="-DPREFIX=/usr -DMANDIR=share/man -DBINDINGS=1 -DCLIENTS=1"
 	myconf="${myconf} -DSWIG_DIR='$(swig -swiglib)'" # bug #192594
-	if use ncurses ; then
-		myconf="${myconf} -DMUCOUS=1"
-	else
-		myconf="${myconf} -DMUCOUS=0"
-	fi
-	if use gtk ; then
-		myconf="${myconf} -DMURMUR=1"
-	else
-		myconf="${myconf} -DMURMUR=0"
-	fi
-	if use qt3 ; then
-		myconf="${myconf} -DNO_MUSEEQ=0"
-		use trayicon && myconf="${myconf} -DTRAYICON=1"
-	else
-		myconf="${myconf} -DNO_MUSEEQ=1"
-	fi
+	myconf="${myconf} -DMUCOUS=$(my_use ncurses)
+		-DMURMUR=$(my_use gtk)
+		-DNO_MUSEEQ=$(my_not_use qt3)
+		-DTRAYICON=$(my_use trayicon)
+		-DQSA=$(my_use qsa)
+		-DNO_MUSCAND=$(my_not_use fam)
+		-DVORBIS=$(my_use vorbis)"
 	if ! use debug ; then
 		myconf="${myconf} -DMULOG=none"
 	fi