Version bump

(Portage version: 2.1.2.2)

7 files changed, 302 insertions, 1 deletions

diff --git a/media-sound/prokyon3/ChangeLog b/media-sound/prokyon3/ChangeLog
index 8d98af829ab5..862e7ea593c2 100644
--- a/media-sound/prokyon3/ChangeLog
+++ b/media-sound/prokyon3/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/prokyon3
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/ChangeLog,v 1.21 2007/01/05 17:45:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/ChangeLog,v 1.22 2007/03/25 18:44:58 aballier Exp $
+
+*prokyon3-0.9.6 (25 Mar 2007)
+
+  25 Mar 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/prokyon3-0.9.6-asneeded.patch, +files/prokyon3-0.9.6-cflags.patch,
+  +files/prokyon3-0.9.6-flac113.patch, +files/prokyon3-0.9.6-qdir.patch,
+  +prokyon3-0.9.6.ebuild:
+  Version bump
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> prokyon3-0.9.4.ebuild,
   prokyon3-0.9.4-r1.ebuild:
diff --git a/media-sound/prokyon3/files/digest-prokyon3-0.9.6 b/media-sound/prokyon3/files/digest-prokyon3-0.9.6
new file mode 100644
index 000000000000..f651178fdfa9
--- /dev/null
+++ b/media-sound/prokyon3/files/digest-prokyon3-0.9.6
@@ -0,0 +1,3 @@
+MD5 c4b3d222a518ff82af66ea4aba458f55 prokyon3-0.9.6.tar.gz 1162620
+RMD160 bf44315856ac04c5733832800e3aa951effc379d prokyon3-0.9.6.tar.gz 1162620
+SHA256 a5c9477b8f15e791860dcd7e7608dcfdc0cf423528a56525a3d20e4d6935cb6a prokyon3-0.9.6.tar.gz 1162620
diff --git a/media-sound/prokyon3/files/prokyon3-0.9.6-asneeded.patch b/media-sound/prokyon3/files/prokyon3-0.9.6-asneeded.patch
new file mode 100644
index 000000000000..d69f0c2fb79f
--- /dev/null
+++ b/media-sound/prokyon3/files/prokyon3-0.9.6-asneeded.patch
@@ -0,0 +1,106 @@
+Index: prokyon3-0.9.6/configure.in
+===================================================================
+--- prokyon3-0.9.6.orig/configure.in
++++ prokyon3-0.9.6/configure.in
+@@ -29,6 +29,8 @@ AC_LANG(C++)
+ # User supplied includes and lib path.
+ ########################################
+ 
++LIBSADDED=""
++
+ AC_ARG_WITH(other-includes,[  --with-other-includes=PATH  additional path where includes are installed (optional)],
+  	  other_includes="$withval",other_includes="")
+ 
+@@ -36,7 +38,7 @@ AC_ARG_WITH(other-libs,[  --with-other-l
+ 	  other_libs="$withval",other_libs="")
+ 
+ if test x$other_libs != x ; then
+-    LDFLAGS="$LDFLAGS -L$other_libs"
++    LIBSADDED="$LIBSADDED -L$other_libs"
+ fi
+ if test x$other_includes != x ; then
+     CPPFLAGS="$CPPFLAGS -I$other_includes"
+@@ -127,7 +129,7 @@ if test x"$ac_use_taglib" = xyes; then
+ 	AC_CHECK_PROG([taglib_config],[taglib-config],[yes],[no])
+ 	if test x"$taglib_config" = xyes; then 
+ 		AC_DEFINE([HAVE_TAG],1,[Taglib libs presence])
+-		LDFLAGS="$LDFLAGS `taglib-config --libs`" 
++		LIBSADDED="$LIBSADDED `taglib-config --libs`" 
+ 		CPPFLAGS="$CPPFLAGS `taglib-config --cflags`" 
+ 		taglib_sup=yes
+ #let's not assume libtag is present....
+@@ -229,7 +231,7 @@ AC_ARG_WITH([musicbrainz],
+ mbrainz_sup=no
+ if test x"$ac_use_mbrainz" = xyes; then
+ 	AC_MSG_NOTICE([======Checking libmusicbrainz  ========])
+-	AC_CHECK_LIB(musicbrainz,main,[LDFLAGS="$LDFLAGS -lmusicbrainz"],
++	AC_CHECK_LIB(musicbrainz,main,[LIBSADDED="$LIBSADDED -lmusicbrainz"],
+ 	[AC_MSG_FAILURE([******* libmusicbrainz library  required.  ********])])
+ 	AC_DEFINE([HAVE_LIBMUSICBRAINZ],1,[Musicbrainz libs OK])
+ 	mbrainz_sup=yes
+@@ -256,7 +258,7 @@ if test x$with_ogg = "x"yes && test x"$m
+ 	AC_MSG_NOTICE([======Checking if Ogg libraries are OK ========])
+ 	AC_CHECK_LIB(ogg, ogg_sync_init,[have_ogg=yes],
+ 	    [AC_MSG_FAILURE([******* libogg library  required.  ********])])
+-	LDFLAGS="$LDFLAGS -logg"
++	LIBSADDED="$LIBSADDED -logg"
+ fi   
+ 
+ if test x$with_ogg = "x"yes && test x"$mbrainz_sup" = xyes; then
+@@ -265,7 +267,7 @@ if test x$with_ogg = "x"yes && test x"$m
+ 
+ 	AC_CHECK_LIB(vorbis, vorbis_info_init,[have_vorbis=yes],
+ 	    [AC_MSG_FAILURE([******* libvorbis library  required.  ********])])
+-	LDFLAGS="$LDFLAGS -lvorbis -lvorbisfile"
++	LIBSADDED="$LIBSADDED -lvorbis -lvorbisfile"
+ fi
+ 
+ if test x"$have_ogg" = xyes; then 
+@@ -292,7 +294,7 @@ if test x$with_mad = "x"yes && test x"$m
+ 	AC_CHECK_LIB(mad,main,[mad_sup=yes],
+ 	[AC_MSG_FAILURE([******* libmad library  required.  ********])])
+ 	AC_DEFINE([HAVE_LIBMAD],1,[Mad lib OK])
+-	LDFLAGS="$LDFLAGS -lmad"
++	LIBSADDED="$LIBSADDED -lmad"
+ fi   
+ 
+ ########################################
+@@ -329,7 +331,7 @@ int main ()
+ 
+ 	],[flac_sup=yes],[AC_MSG_FAILURE([******* libFLAC++ library  required.  ********])])
+ 	AC_MSG_RESULT([$flac_sup])
+-	LDFLAGS="$LDFLAGS -lFLAC++ -lFLAC"
++	LIBSADDED="$LIBSADDED -lFLAC++ -lFLAC"
+ 	AC_DEFINE([HAVE_FLAC],1,[Flac libs OK])
+ fi   
+ 
+@@ -441,7 +443,7 @@ if test x$ac_use_embedded = "xyes" ; the
+ 	
+ 	case "$MYSQL_libdir" in
+ 	  /usr/lib) ;;
+-	  *) LDFLAGS="$LDFLAGS -L${MYSQL_libdir}" ;;
++	  *) LIBSADDED="$LIBSADDED -L${MYSQL_libdir}" ;;
+ 	esac
+ 	
+ 	AC_MSG_CHECKING([for MySQL include directory])
+@@ -505,6 +507,7 @@ rm -f temp$$
+ ########################################
+ ## Generate makefiles
+ ########################################
++AC_SUBST(LIBSADDED)
+ AC_CONFIG_FILES([Makefile src/Makefile intl/Makefile po/Makefile.in sql++/Makefile])
+ AC_OUTPUT
+ 
+Index: prokyon3-0.9.6/src/Makefile.am
+===================================================================
+--- prokyon3-0.9.6.orig/src/Makefile.am
++++ prokyon3-0.9.6/src/Makefile.am
+@@ -96,7 +96,7 @@ BUILT_SOURCES = $(prokyon3_MOC)
+ 
+ prokyon3_CXXFLAGS = $(QT_CXXFLAGS) -DQT_THREAD_SUPPORT  -DQT_NO_ASCII_CAST -DPREFIX=\"$(prefix)\" 
+ 
+-prokyon3_LDFLAGS = $(QT_GUILINK) $(QT_LDADD) $(ID3_LIBS)  @INTLLIBS@
++prokyon3_LDADD = $(QT_GUILINK) $(QT_LDADD) $(ID3_LIBS)  @INTLLIBS@ @LIBSADDED@
+ 
+ %.moc.cpp: %.h
+ 	$(MOC) -o $@ $<
diff --git a/media-sound/prokyon3/files/prokyon3-0.9.6-cflags.patch b/media-sound/prokyon3/files/prokyon3-0.9.6-cflags.patch
new file mode 100644
index 000000000000..f7a8e23d1076
--- /dev/null
+++ b/media-sound/prokyon3/files/prokyon3-0.9.6-cflags.patch
@@ -0,0 +1,14 @@
+Index: prokyon3-0.9.6/configure.in
+===================================================================
+--- prokyon3-0.9.6.orig/configure.in
++++ prokyon3-0.9.6/configure.in
+@@ -23,9 +23,7 @@ AC_DEFINE_UNQUOTED([HAVE_LANGUAGE],["$AL
+ AC_PROG_CXX
+ AC_PROG_CC
+ AC_LANG(C++)
+-CXXFLAGS="-O0 -g3 $CXXFLAGS"
+ #CXXFLAGS="-O3"
+-CFLAGS=$CXXFLAGS
+ 
+ ########################################
+ # User supplied includes and lib path.
diff --git a/media-sound/prokyon3/files/prokyon3-0.9.6-flac113.patch b/media-sound/prokyon3/files/prokyon3-0.9.6-flac113.patch
new file mode 100644
index 000000000000..76a6717d1014
--- /dev/null
+++ b/media-sound/prokyon3/files/prokyon3-0.9.6-flac113.patch
@@ -0,0 +1,69 @@
+Index: prokyon3-0.9.6/src/qmbflacfile.cpp
+===================================================================
+--- prokyon3-0.9.6.orig/src/qmbflacfile.cpp
++++ prokyon3-0.9.6/src/qmbflacfile.cpp
+@@ -33,6 +33,12 @@ Foundation, Inc., 59 Temple Place, Suite
+ #include <musicbrainz/mb_c.h>
+ #include <FLAC++/metadata.h>
+ 
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ QMBFLACFile::QMBFLACFile()
+ : QMBFile(), FLAC::Decoder::File(), offset(0), decode_error(false) {
+     //we do nothing here.  we want to allow checking of return value,
+@@ -57,17 +63,27 @@ int QMBFLACFile::Extract(QString filenam
+     int lastslash = filename.findRev('/');
+     metadata.SetFileName(filename.right(filename.length() - lastslash - 1));
+ 
++#ifdef LEGACY_FLAC
+     //set the filename with the FLAC::Decoder::File class
+     set_filename(fullfilename.latin1());
++#endif
+ 
+     //tell the decoder to call the metadata callback on vorbis comments so we can get the metadata already stored in the file
+     set_metadata_respond(FLAC__METADATA_TYPE_VORBIS_COMMENT);
+ 
+     //Start reading the FLAC file
++#ifdef LEGACY_FLAC
+     FLAC__FileDecoderState state = init();
+ 
+     if (state != FLAC__FILE_DECODER_OK) {
+         qWarning("QMBFLACFile::Extract(): error opening file: %i (%s).", state, FLAC__FileDecoderStateString[state]);
++#else
++    FLAC__StreamDecoderState state;
++    FLAC__StreamDecoderInitStatus initstate = init(fullfilename.latin1());
++
++    if (initstate != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
++        qWarning("QMBFLACFile::Extract(): error opening file: %i (%s).", initstate, FLAC__StreamDecoderStateString[initstate]);
++#endif
+         finish();
+         return -1;
+     }
+@@ -75,7 +91,11 @@ int QMBFLACFile::Extract(QString filenam
+     //read through all the metadata so our callback can catch it all
+     if(!process_until_end_of_metadata ()) {
+         state = get_state();
++#ifdef LEGACY_FLAC
+         qWarning("QMBFLACFile::Extract(): error getting metadata: %i (%s).", state, FLAC__FileDecoderStateString[state]);
++#else
++        qWarning("QMBFLACFile::Extract(): error getting metadata: %i (%s).", state, FLAC__StreamDecoderStateString[state] );
++#endif
+         decode_error = true;
+         finish();
+         return -2;
+@@ -108,7 +128,11 @@ int QMBFLACFile::Extract(QString filenam
+     while (!decode_error && offset < (unsigned long) bufferlen) {
+         if (!process_single()) {
+             state = get_state();
++#ifdef LEGACY_FLAC
+             qWarning("QMBFLACFile::Extract(): error getting raw data: %i (%s).", state, FLAC__FileDecoderStateString[state]);
++#else
++            qWarning("QMBFLACFile::Extract(): error getting raw data: %i (%s).", state, FLAC__StreamDecoderStateString[state]);
++#endif
+             decode_error = true;
+             finish();
+             return -2;
diff --git a/media-sound/prokyon3/files/prokyon3-0.9.6-qdir.patch b/media-sound/prokyon3/files/prokyon3-0.9.6-qdir.patch
new file mode 100644
index 000000000000..80b4746bb373
--- /dev/null
+++ b/media-sound/prokyon3/files/prokyon3-0.9.6-qdir.patch
@@ -0,0 +1,12 @@
+Index: prokyon3-0.9.6/src/job_importplaylist.cpp
+===================================================================
+--- prokyon3-0.9.6.orig/src/job_importplaylist.cpp
++++ prokyon3-0.9.6/src/job_importplaylist.cpp
+@@ -9,6 +9,7 @@
+ #include <qstringlist.h>
+ #include <qregexp.h>
+ #include <qfile.h>
++#include <qdir.h>
+ #include <qfileinfo.h>
+ 
+ #ifdef EMBEDDED
diff --git a/media-sound/prokyon3/prokyon3-0.9.6.ebuild b/media-sound/prokyon3/prokyon3-0.9.6.ebuild
new file mode 100644
index 000000000000..80364a142051
--- /dev/null
+++ b/media-sound/prokyon3/prokyon3-0.9.6.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/prokyon3-0.9.6.ebuild,v 1.1 2007/03/25 18:44:58 aballier Exp $
+
+inherit qt3 eutils autotools
+
+DESCRIPTION="Multithreaded music manager and tag editor based on Qt and MySQL."
+HOMEPAGE="http://prokyon3.sourceforge.net"
+SRC_URI="mirror://sourceforge/prokyon3/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="flac mp3 musicbrainz taglib vorbis"
+
+DEPEND="$(qt_min_version 3.2)
+	media-libs/taglib
+	taglib? ( media-libs/taglib )
+	musicbrainz? ( media-libs/musicbrainz
+		mp3? ( media-libs/libmad )
+		vorbis? ( media-libs/libvorbis )
+		flac? ( media-libs/flac ) )"
+
+pkg_setup() {
+	if ! built_with_use =x11-libs/qt-3* mysql; then
+		eerror "You have installed Qt without MySQL support."
+		eerror "Please reemerge x11-libs/qt-3* with "mysql" in USE."
+		die "MySQL support for Qt not found."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-cflags.patch"
+	epatch "${FILESDIR}/${P}-qdir.patch"
+	epatch "${FILESDIR}/${P}-flac113.patch"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	eautoreconf
+}
+
+src_compile() {
+	# Support for musicextras (not in portage)
+	# requires dev-libs/xmlwrapp.
+
+	local myconf="--with-taglib
+			--without-id3
+			--without-mysql-embedded
+			--without-musicextras"
+
+	if use musicbrainz; then
+		myconf="${myconf}
+			--with-musicbrainz
+			$(use_with mp3 mad)
+			$(use_with vorbis ogg)
+			$(use_with flac)"
+	else
+		myconf="${myconf}
+			--without-musicbrainz"
+	fi
+
+	econf ${myconf}	$(use_with taglib) || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	echo
+	elog "Prokyon3 supports the following external programs"
+	elog "to play audio tracks:"
+	elog " - media-sound/amarok"
+	elog " - media-sound/beep-media-player"
+	elog " - media-video/kaffeine"
+	elog " - media-video/mplayer"
+	elog " - kde-base/noatun or kde-base/kdemultimedia"
+	elog " - media-video/totem"
+	elog " - media-sound/xmms"
+	elog
+	elog "Prokyon3 also supports the following external"
+	elog "applications, if installed:"
+	elog " - app-cdr/k3b:          CD burning"
+	elog " - media-sound/mixxx:    DJ mixing"
+	echo
+}