Make sure that HOWL support is really enabled, as per bug #96818.

(Portage version: 2.0.53_rc6)

6 files changed, 49 insertions, 30 deletions

diff --git a/media-sound/daapd/ChangeLog b/media-sound/daapd/ChangeLog
index a761bf5537d9..5a4f39f19491 100644
--- a/media-sound/daapd/ChangeLog
+++ b/media-sound/daapd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/daapd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/daapd/ChangeLog,v 1.17 2005/10/17 11:44:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/daapd/ChangeLog,v 1.18 2005/10/25 05:26:32 flameeyes Exp $
+
+*daapd-0.2.4a-r2 (25 Oct 2005)
+
+  25 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  files/daapd-0.2.4-gentoo.patch, +files/daapd-0.2.4a-defaults.patch,
+  -daapd-0.2.4a-r1.ebuild, +daapd-0.2.4a-r2.ebuild:
+  Make sure that HOWL support is really enabled, as per bug #96818.
 
 *daapd-0.2.4a-r1 (17 Oct 2005)
 
diff --git a/media-sound/daapd/Manifest b/media-sound/daapd/Manifest
index 38ddd3a72461..bf901b3f5e64 100644
--- a/media-sound/daapd/Manifest
+++ b/media-sound/daapd/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 24134d107499a585552a174cbf79458c ChangeLog 3652
-MD5 671db4d6a437056ae62192a7799de75a daapd-0.2.4a-r1.ebuild 1835
-MD5 660b25ab66dc0cb5147d21b2db00b685 files/daapd-0.2.4-gentoo.patch 1564
+MD5 f0bca3de7b15198b9009067c5432c1da daapd-0.2.4a-r2.ebuild 1724
+MD5 31dc37e250f18a48db2181a27bd4f1a8 files/daapd-0.2.4-gentoo.patch 1547
+MD5 a1337fb36f64debbe8643a95d2231f25 files/daapd-0.2.4a-defaults.patch 617
 MD5 3beda326653c14c1fbd33c762af01e2e files/daapd.conf.d 673
 MD5 55d5a5f4ecb94a9b34a603fa95047c48 files/daapd.init.d-2 1053
-MD5 3bce8ff40d70534e3b94f58ea9043b07 files/digest-daapd-0.2.4a-r1 61
+MD5 3bce8ff40d70534e3b94f58ea9043b07 files/digest-daapd-0.2.4a-r2 61
 MD5 5209c0057b32b7d92999700515bed3aa metadata.xml 440
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDU47Jj5H05b2HAEkRAgYZAJ0bN51L6Rc0FwW0NN66SyhkHOmNlwCgiyqD
-YzlMsbON4yM7Z4g5sS/yapU=
-=/kxm
------END PGP SIGNATURE-----
diff --git a/media-sound/daapd/daapd-0.2.4a-r1.ebuild b/media-sound/daapd/daapd-0.2.4a-r2.ebuild
index ac6cb722b44e..7b0fa6a37436 100644
--- a/media-sound/daapd/daapd-0.2.4a-r1.ebuild
+++ b/media-sound/daapd/daapd-0.2.4a-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/daapd/daapd-0.2.4a-r1.ebuild,v 1.1 2005/10/17 11:44:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/daapd/daapd-0.2.4a-r2.ebuild,v 1.1 2005/10/25 05:26:32 flameeyes Exp $
 
 inherit flag-o-matic eutils
 
@@ -23,7 +23,8 @@ DEPEND="sys-libs/zlib
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-0.2.4-gentoo.patch
+	epatch "${FILESDIR}/${PN}-0.2.4-gentoo.patch"
+	epatch "${FILESDIR}/${P}-defaults.patch"
 }
 
 src_compile() {
@@ -31,21 +32,17 @@ src_compile() {
 	use howl && want_howl="1" || want_howl="0"
 	use mpeg4 && want_mpeg4="1" || want_mpeg4="0"
 
-	# This warning outputs a lot of noise and it's disabled by the original
-	# makefile, as we rewrite CFLAGS, append this again.
-	append-flags -Wno-multichar
-
-	# The makefile is dump, uses $(CC) to compile .cc files
+	# The makefile is dumb, uses $(CC) to compile .cc files
 	# pass it a C++ compiler and C++ flags
 	emake \
-		CC=$(tc-getCXX) CFLAGS="${CXXFLAGS}" \
+		CC=$(tc-getCXX) OPTFLAGS="${CXXFLAGS}" \
 		HOWL_ENABLE="$want_howl" MPEG4_ENABLE="$want_mpeg4" \
 		|| die "make failed"
 
 	# Make sure that it requires mDNSResponder while using howl
 	cp ${FILESDIR}/daapd.init.d-2 ${WORKDIR}/daapd.init.d
 	use howl && \
-		sed -i -e 's:#WITHHOWL::' ${WORKDIR}/daapd.init.d || \
+		sed -i -e 's:#WITHHOWL ::' ${WORKDIR}/daapd.init.d || \
 		sed -i -e '/#WITHHOWL/d' ${WORKDIR}/daapd.init.d
 }
 
diff --git a/media-sound/daapd/files/daapd-0.2.4-gentoo.patch b/media-sound/daapd/files/daapd-0.2.4-gentoo.patch
index cfa78fb87c62..2239fcd522f3 100644
--- a/media-sound/daapd/files/daapd-0.2.4-gentoo.patch
+++ b/media-sound/daapd/files/daapd-0.2.4-gentoo.patch
@@ -1,6 +1,7 @@
-diff -uprN daapd-0.2.4.orig/makefile daapd-0.2.4/makefile
---- daapd-0.2.4.orig/makefile	2005-04-28 17:35:27.000000000 +0200
-+++ daapd-0.2.4/makefile	2005-04-28 17:36:49.000000000 +0200
+Index: daapd-0.2.4a/makefile
+===================================================================
+--- daapd-0.2.4a.orig/makefile
++++ daapd-0.2.4a/makefile
 @@ -11,19 +11,19 @@ MPEG4_ENABLE = 0
  CC = g++
  MAKE = $(MAKE_COMMAND)
@@ -12,10 +13,11 @@ diff -uprN daapd-0.2.4.orig/makefile daapd-0.2.4/makefile
 -LIBPATH = -L. -L./daaplib/src -L./libhttpd/src  -L/usr/local/lib
 -INCPATH = -I. -I./daaplib/include -I./libhttpd/src  -I/usr/local/include
 -DEPLOY = /usr/local
+-CFLAGS = -Wall -Wno-multichar
 +LIBPATH = -L. -L/usr/lib
 +INCPATH = -I. -I/usr/include
 +DEPLOY = /usr
- CFLAGS = -Wall -Wno-multichar
++CFLAGS := $(OPTFLAGS) -Wall -Wno-multichar
  
  # HOWL
  ifeq ($(HOWL_ENABLE),1)
@@ -27,9 +29,10 @@ diff -uprN daapd-0.2.4.orig/makefile daapd-0.2.4/makefile
  endif
  	HOWLRECENT := $(word $(words $(HOWLDIRS)),$(HOWLDIRS) )
  	INCPATH := $(INCPATH) -I$(HOWLRECENT)
-diff -uprN daapd-0.2.4.orig/types.h daapd-0.2.4/types.h
---- daapd-0.2.4.orig/types.h	2005-04-28 17:35:27.000000000 +0200
-+++ daapd-0.2.4/types.h	2005-04-28 17:37:15.000000000 +0200
+Index: daapd-0.2.4a/types.h
+===================================================================
+--- daapd-0.2.4a.orig/types.h
++++ daapd-0.2.4a/types.h
 @@ -20,6 +20,10 @@
  	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
diff --git a/media-sound/daapd/files/daapd-0.2.4a-defaults.patch b/media-sound/daapd/files/daapd-0.2.4a-defaults.patch
new file mode 100644
index 000000000000..fea56d85ac40
--- /dev/null
+++ b/media-sound/daapd/files/daapd-0.2.4a-defaults.patch
@@ -0,0 +1,21 @@
+As pointed out by Paul forgey in bug #96818, makefile was defining as constant
+overwriting the passed values for the three _ENABLED variables.
+This patch makes them take a default value if not set otherwise, allowing us to
+pass different values during make stage.
+
+Index: daapd-0.2.4a/makefile
+===================================================================
+--- daapd-0.2.4a.orig/makefile
++++ daapd-0.2.4a/makefile
+@@ -1,8 +1,8 @@
+ # configure daapd here
+ 
+-HOWL_ENABLE = 0
+-ZLIB_ENABLE = 1
+-MPEG4_ENABLE = 0
++HOWL_ENABLE := 0
++ZLIB_ENABLE := 1
++MPEG4_ENABLE := 0
+ 
+ 
+ # no need to touch anything below this line
diff --git a/media-sound/daapd/files/digest-daapd-0.2.4a-r1 b/media-sound/daapd/files/digest-daapd-0.2.4a-r2
index d585de6a53dd..d585de6a53dd 100644
--- a/media-sound/daapd/files/digest-daapd-0.2.4a-r1
+++ b/media-sound/daapd/files/digest-daapd-0.2.4a-r2