Bump to a newer nightlie, the patch used previously it's applied upstream.

Package-Manager: portage-2.1_pre4-r1

6 files changed, 52 insertions, 148 deletions

diff --git a/media-sound/mt-daapd/ChangeLog b/media-sound/mt-daapd/ChangeLog
index c0b96d1eae82..520d441c7353 100644
--- a/media-sound/mt-daapd/ChangeLog
+++ b/media-sound/mt-daapd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mt-daapd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.14 2006/01/12 17:41:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.15 2006/02/06 01:56:38 flameeyes Exp $
+
+*mt-daapd-0.3.0_pre20060117 (06 Feb 2006)
+
+  06 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/mt-daapd-20060112-libs.patch, -mt-daapd-0.3.0_pre20060112.ebuild,
+  +mt-daapd-0.3.0_pre20060117.ebuild:
+  Bump to a newer nightlie, the patch used previously it's applied upstream.
 
 *mt-daapd-0.3.0_pre20060112 (12 Jan 2006)
 
diff --git a/media-sound/mt-daapd/Manifest b/media-sound/mt-daapd/Manifest
index 7c7989b2a132..0259273db3a5 100644
--- a/media-sound/mt-daapd/Manifest
+++ b/media-sound/mt-daapd/Manifest
@@ -1,25 +1,52 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4c73ff34f8341f5b0aa4dfc69b3bc7ce ChangeLog 2875
+MD5 183e693ee8b951c12bc847896e70a4f2 ChangeLog 3162
+RMD160 b916ff03c9f313991928cdb9385ee51ae861c84b ChangeLog 3162
+SHA256 a38a0fe206267c125e00637e06b63d6ed39ab5485a07ce81c39fac30ec6ce66b ChangeLog 3162
 MD5 804311ec22b1fba76a61411d0c752a15 files/digest-mt-daapd-0.2.1.1 68
+RMD160 774b47dcfa875659f0da6eeed6fa76062868d157 files/digest-mt-daapd-0.2.1.1 68
+SHA256 857f910fe65da798f7ee7f3eb3264aaf5202a6d73a2f79fed699977e21f301ba files/digest-mt-daapd-0.2.1.1 68
 MD5 a83c2c2bb548a45b8b1294e009aff64d files/digest-mt-daapd-0.2.3-r2 66
-MD5 ec403b48af5c6a0a2addbe3ec692f67f files/digest-mt-daapd-0.3.0_pre20060112 73
+RMD160 e3308391eda8bffed09fdd9494d7739303a61ddf files/digest-mt-daapd-0.2.3-r2 66
+SHA256 da0f3c058aca6cc1c944f8bc9104e5037d2e8c64766602532314d55e8e5b1799 files/digest-mt-daapd-0.2.3-r2 66
+MD5 16a6116fbf004fd1f47311aeae546b0a files/digest-mt-daapd-0.3.0_pre20060117 265
+RMD160 b5be731558ca3546fe24a14ac39d9f7bea45695a files/digest-mt-daapd-0.3.0_pre20060117 265
+SHA256 9af930f22b3bfa58a60f3ff0ae890f6d03e1977d71b4723ab6b8214c9156264e files/digest-mt-daapd-0.3.0_pre20060117 265
 MD5 55238544e58e1a12aa7a405779d03fb1 files/mt-daapd-0.2.3-libsorder.patch 5162
+RMD160 10e8197fee61223e96942a9d130dd616d1bd3b46 files/mt-daapd-0.2.3-libsorder.patch 5162
+SHA256 ed726102ea4c180901c0adfcdaaf277185e9cf95e5579351384f2aa77ca60afd files/mt-daapd-0.2.3-libsorder.patch 5162
 MD5 40d97e03e85d347c0ddf88f5f07d4093 files/mt-daapd-0.2.3-persist-fix.patch 1182
+RMD160 16140991bc0c8a8b6ef525eb8b889975f6298f8c files/mt-daapd-0.2.3-persist-fix.patch 1182
+SHA256 61d747f16458a1d9950e909330229ab23d247caa55957e53278849cea9ead338 files/mt-daapd-0.2.3-persist-fix.patch 1182
 MD5 b6ec66b0ccfd69869025f1bba1421dd6 files/mt-daapd-0.2.3-pidfile.patch 1918
+RMD160 5103e2096a3b78219ac94cbaaf3b22dc194e81a0 files/mt-daapd-0.2.3-pidfile.patch 1918
+SHA256 265088c7773653d2b2ee02da665f985d99535ab8f0d8b221d19b33e54e3f5c7b files/mt-daapd-0.2.3-pidfile.patch 1918
 MD5 227a3d186fe7904440caec11492341db files/mt-daapd-0.2.3-sparc.patch 927
-MD5 e0b3eabb341a4f30c7c931d02a620e3e files/mt-daapd-20060112-libs.patch 4389
+RMD160 029a51e22054655fac678e254f427748b941ab48 files/mt-daapd-0.2.3-sparc.patch 927
+SHA256 fda7219e9cca646520debb1a1f853ea8144e6c3db7c04004cddeeb173df9645b files/mt-daapd-0.2.3-sparc.patch 927
 MD5 d14aca83cf21b8c519b42962ba276e42 files/mt-daapd.init 540
+RMD160 2989476cfd7ed00cc6941c20acccc24d1412a4fb files/mt-daapd.init 540
+SHA256 c4a0f6af9711b7ada20e47826991706e8f466c5d9d6b04975bc71ada598442ab files/mt-daapd.init 540
 MD5 674db97976bcc4e34df95a17ffe8750c files/mt-daapd.init.2 1200
+RMD160 b5dc96a1bf7c390d9a818ea5a8018ac6c1f8a90c files/mt-daapd.init.2 1200
+SHA256 6e4336639ead7da81d659a289fad0600b30b112420016fd63bf426eeae2098a1 files/mt-daapd.init.2 1200
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
 MD5 880127a188cf908b0ad84221e48eeebf mt-daapd-0.2.1.1.ebuild 1936
+RMD160 d3207f93ae7fa154ca49e89f2973d05555dfc5b3 mt-daapd-0.2.1.1.ebuild 1936
+SHA256 4287301a256053216fe2991cf8a98154a566a5202e45d53e2ac713061bda7b9b mt-daapd-0.2.1.1.ebuild 1936
 MD5 4e20971d10008c86db9e602e3b738fa1 mt-daapd-0.2.3-r2.ebuild 3500
-MD5 a2d15dd789866f9409844a5556d2fae1 mt-daapd-0.3.0_pre20060112.ebuild 3958
+RMD160 1ec9be70b801403798f4dd38903d0b2ca67a81df mt-daapd-0.2.3-r2.ebuild 3500
+SHA256 517f1bf2397d3dc2e5952502d2f554dff0307ed7980cfdb881f0681da6855279 mt-daapd-0.2.3-r2.ebuild 3500
+MD5 283ef889ff7e57bc7c3860b79e9af80e mt-daapd-0.3.0_pre20060117.ebuild 3901
+RMD160 ba3fe6716cc36149373649f27710fd8037a79cc0 mt-daapd-0.3.0_pre20060117.ebuild 3901
+SHA256 87541ca482171fcac56ad85cda594bd8a5be86b63f767c01bc3efa4d19570d07 mt-daapd-0.3.0_pre20060117.ebuild 3901
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDxpTGAiZjviIA2XgRAufnAKCuPkpw1l50gua+FZ4qmyog4yXKeQCgsrX0
-99/7izuo/aSiP9LV3eBO+HQ=
-=8jy8
+iD8DBQFD5qzsAiZjviIA2XgRAslbAJ98lXmbfB8bXA/xCtDaMiDpzHrXIQCdFbi/
+KDgmZI2GIujaPZ/okj2M/08=
+=6wS5
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre20060112 b/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre20060112
deleted file mode 100644
index 8c2400387dfb..000000000000
--- a/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre20060112
+++ /dev/null
@@ -1 +0,0 @@
-MD5 33d021ec7933db96074627bba2478f06 mt-daapd-cvs-20060112.tar.gz 777107
diff --git a/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre20060117 b/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre20060117
new file mode 100644
index 000000000000..cfaba57f118e
--- /dev/null
+++ b/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre20060117
@@ -0,0 +1,3 @@
+MD5 3d849356341f46dc5eaf4f85917fe40d mt-daapd-cvs-20060117.tar.gz 777043
+RMD160 399c34d519808ab728ce62591972547561a716ea mt-daapd-cvs-20060117.tar.gz 777043
+SHA256 93de02f4aa357b93a77ee9942df9472840cce25d8f927f7e0d4f900ff523d0d3 mt-daapd-cvs-20060117.tar.gz 777043
diff --git a/media-sound/mt-daapd/files/mt-daapd-20060112-libs.patch b/media-sound/mt-daapd/files/mt-daapd-20060112-libs.patch
deleted file mode 100644
index 6f93f5bc197f..000000000000
--- a/media-sound/mt-daapd/files/mt-daapd-20060112-libs.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Index: mt-daapd-cvs-20060112/configure.in
-===================================================================
---- mt-daapd-cvs-20060112.orig/configure.in
-+++ mt-daapd-cvs-20060112/configure.in
-@@ -23,8 +23,8 @@ STATIC_LIBS=no
- CPPFLAGS="${CPPFLAGS} -g -Wall"
- 
- dnl fix freebsd's broken (?) libpthread
--AC_CHECK_LIB(c_r,pthread_creat,LDFLAGS="${LDFLAGS} -lc_r", [
--  AC_CHECK_LIB(pthread,pthread_create,LDFLAGS="${LDFLAGS} -lpthread") ])
-+AC_CHECK_LIB(c_r,pthread_creat,LIBS="${LIBS} -lc_r", [
-+  AC_CHECK_LIB(pthread,pthread_create,LIBS="${LIBS} -lpthread") ])
- 
- AC_ARG_ENABLE(sqlite,[  --enable-sqlite         Enable the sqlite db backend],
- 			[ case "${enableval}" in
-@@ -52,7 +52,7 @@ AC_ARG_ENABLE(nslu2,[  --enable-nslu2   
- 
- AC_ARG_ENABLE(howl,[  --enable-howl       Use howl 0.9.2 or later],
- 		      [ case "${enableval}" in
--                        yes) rend_howl=true; rend_posix=false; LDFLAGS="${LDFLAGS} -lhowl";
-+                        yes) rend_howl=true; rend_posix=false; LIBS="${LIBS} -lhowl";
- 			CPPFLAGS="${CPPFLAGS} -DWITH_HOWL";;
- 		        no)  rend_howl=false;;
- 		        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-howl);;
-@@ -101,7 +101,7 @@ case $host in
- 	CPPFLAGS="$CPPFLAGS -DNOT_HAVE_SA_LEN -D_XPG4_2"
- 	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME"
- 	CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
--	LDFLAGS="$LDFLAGS -lnsl -lsocket";;	
-+	LIBS="${LIBS} -lnsl -lsocket";;	
- *freebsd*)
- 	CPPFLAGS="$CPPFLAGS -DFREEBSD";;
- *linux*)
-@@ -162,9 +162,9 @@ CFLAGS="$CFLAGS -lz"
- AC_CHECK_LIB(id3tag,id3_file_open,,echo "no libid3tag. Try --with-id3tag=dir";exit)
- 
- if test "$STATIC_LIBS" != "no"; then
--  LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libid3tag.a -lz"
-+  LIBS="${LIBS} ${STATIC_LIBS}/libid3tag.a -lz"
- else
--  LDFLAGS="${LDFLAGS} -lid3tag -lz"
-+  LIBS="${LIBS} -lid3tag -lz"
- fi
- CFLAGS=$oldcflags
- 
-@@ -174,9 +174,9 @@ if test x$db_sqlite = xtrue; then
-   AC_CHECK_LIB(sqlite,sqlite_open,,echo "Must have sqlite libraries installed";exit)
- 
-   if test x"$STATIC_LIBS" != x"no"; then
--    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libsqlite.a"
-+    LIBS="${LIBS} ${STATIC_LIBS}/libsqlite.a"
-   else
--    LDFLAGS="${LDFLAGS} -lsqlite"
-+    LIBS="${LIBS} -lsqlite"
-   fi
- fi
- 
-@@ -186,9 +186,9 @@ if test x$db_sqlite3 = xtrue; then
-   AC_CHECK_LIB(sqlite3,sqlite3_open,,echo "Must have sqlite3 libraries installed";exit)
- 
-   if test x"$STATIC_LIBS" != x"no"; then
--    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libsqlite3.a"
-+    LIBS="${LIBS} ${STATIC_LIBS}/libsqlite3.a"
-   else
--    LDFLAGS="${LDFLAGS} -lsqlite3"
-+    LIBS="${LIBS} -lsqlite3"
-   fi
- fi
- 
-@@ -199,9 +199,9 @@ if test x$use_oggvorbis = xtrue; then
-   AC_CHECK_LIB(ogg,ogg_sync_init,,echo "Must have libogg for Ogg/Vorbis support";exit)
- 
-   if test x"$STATIC_LIBS" != x"no"; then
--    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libogg.a"
-+    LIBS="${LIBS} ${STATIC_LIBS}/libogg.a"
-   else
--    LDFLAGS="${LDFLAGS} -logg"
-+    LIBS="${LIBS} -logg"
-   fi
- 
-   AC_CHECK_HEADERS(vorbis/codec.h,, [
-@@ -209,16 +209,16 @@ if test x$use_oggvorbis = xtrue; then
-   AC_CHECK_LIB(vorbis,vorbis_info_init,,echo "Must have libvorbis for Ogg/Vorbis support";exit)
- 
-   if test x"$STATIC_LIBS" != x"no"; then
--    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libvorbis.a"
-+    LIBS="${LIBS} ${STATIC_LIBS}/libvorbis.a"
-   else
--    LDFLAGS="${LDFLAGS} -lvorbis"
-+    LIBS="${LIBS} -lvorbis"
-   fi
- 
-   AC_CHECK_LIB(vorbisfile,ov_open,,echo "Must have libvorbisfile for Ogg/Vorbis support";exit)
-   if test x"$STATIC_LIBS" != x"no"; then
--    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libvorbisfile.a"
-+    LIBS="${LIBS} ${STATIC_LIBS}/libvorbisfile.a"
-   else
--    LDFLAGS="${LDFLAGS} -lvorbisfile"
-+    LIBS="${LIBS} -lvorbisfile"
-   fi
- fi
- 
-@@ -228,9 +228,9 @@ if test x$use_flac = xtrue; then
-   AC_CHECK_LIB(FLAC,FLAC__metadata_chain_read,,echo "Must have libFLAC for FLAC support";exit)
- 
-   if test x"$STATIC_LIBS" != x"no"; then
--    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libFLAC.a"
-+    LIBS="${LIBS} ${STATIC_LIBS}/libFLAC.a"
-   else
--    LDFLAGS="${LDFLAGS} -lFLAC"
-+    LIBS="${LIBS} -lFLAC"
-   fi
- fi
- 
-@@ -246,9 +246,9 @@ dnl        AC_MSG_ERROR(['Taglib C bindi
- dnl  fi
- 
-   if test x"$STATIC_LIBS" != x"no"; then
--    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libtag_c.a"
-+    LIBS="${LIBS} ${STATIC_LIBS}/libtag_c.a"
-   else
--    LDFLAGS="${LDFLAGS} -ltag_c"
-+    LIBS="${LIBS} -ltag_c"
-   fi
- fi
- 
diff --git a/media-sound/mt-daapd/mt-daapd-0.3.0_pre20060112.ebuild b/media-sound/mt-daapd/mt-daapd-0.3.0_pre20060117.ebuild
index 9faee06d2d9e..526cc6f70f4b 100644
--- a/media-sound/mt-daapd/mt-daapd-0.3.0_pre20060112.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-0.3.0_pre20060117.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.3.0_pre20060112.ebuild,v 1.1 2006/01/12 17:41:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.3.0_pre20060117.ebuild,v 1.1 2006/02/06 01:56:38 flameeyes Exp $
 
-inherit eutils autotools
+inherit eutils flag-o-matic
 
 CVS="${PV#*pre}"
 
@@ -22,11 +22,11 @@ HOMEPAGE="http://www.mt-daapd.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc-macos ~sh ~sparc ~x86"
-IUSE="howl vorbis avahi sqlite sqlite3 flac"
+IUSE="howl vorbis avahi sqlite3 flac"
 
 DEPEND="sys-libs/zlib
 	media-libs/libid3tag
-	sqlite? ( =dev-db/sqlite-2* )
+	!sqlite3? ( =dev-db/sqlite-2* )
 	sqlite3? ( =dev-db/sqlite-3* )
 	howl? ( !avahi? ( >=net-misc/howl-0.9.2 )
 		avahi? ( net-dns/avahi ) )
@@ -50,18 +50,12 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/${PN}-${CVS}-libs.patch"
-
-	eautoreconf
-}
-
 src_compile() {
 	local myconf=""
 	local howlincludes
 
+	append-flags -fno-strict-aliasing
+
 	# howl support?
 	if use howl; then
 		use avahi && \
@@ -82,7 +76,7 @@ src_compile() {
 	econf \
 		$(use_enable vorbis oggvorbis) \
 		$(use_enable flac) \
-		$(use_enable sqlite) \
+		$(use_enable !sqlite3 sqlite) \
 		$(use_enable sqlite3) \
 		${myconf} || die "configure failed"
 	emake || die "make failed"