Fixed gcc-4.1 compile issue, bug 140999.

(Portage version: 2.1.1-r1)

5 files changed, 121 insertions, 1 deletions

diff --git a/media-sound/prokyon3/ChangeLog b/media-sound/prokyon3/ChangeLog
index 2dd35d81de1c..1f97c0fb147c 100644
--- a/media-sound/prokyon3/ChangeLog
+++ b/media-sound/prokyon3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/prokyon3
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/ChangeLog,v 1.15 2006/03/08 20:29:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/ChangeLog,v 1.16 2006/10/16 14:20:20 matsuu Exp $
+
+*prokyon3-0.9.4-r1 (16 Oct 2006)
+
+  16 Oct 2006; MATSUU Takuto <matsuu@gentoo.org>
+  +files/prokyon3-0.9.4-gcc41.patch, +prokyon3-0.9.4-r1.ebuild:
+  Fixed gcc-4.1 compile issue, bug 140999.
 
   08 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> prokyon3-0.9.2.ebuild,
   prokyon3-0.9.4.ebuild:
diff --git a/media-sound/prokyon3/files/digest-prokyon3-0.9.4 b/media-sound/prokyon3/files/digest-prokyon3-0.9.4
index 86e871ba2a0b..cd866b4ca0cd 100644
--- a/media-sound/prokyon3/files/digest-prokyon3-0.9.4
+++ b/media-sound/prokyon3/files/digest-prokyon3-0.9.4
@@ -1 +1,3 @@
 MD5 4c85f65734e3308d3f3b09fe36b689cb prokyon3-0.9.4.tar.gz 1230467
+RMD160 49f00440de9698def2a5f13c2405d354abc47f71 prokyon3-0.9.4.tar.gz 1230467
+SHA256 57e5e9d67a81e171120de7de8f70eca575d10cadacbddab76a2eaf9d025f61fa prokyon3-0.9.4.tar.gz 1230467
diff --git a/media-sound/prokyon3/files/digest-prokyon3-0.9.4-r1 b/media-sound/prokyon3/files/digest-prokyon3-0.9.4-r1
new file mode 100644
index 000000000000..cd866b4ca0cd
--- /dev/null
+++ b/media-sound/prokyon3/files/digest-prokyon3-0.9.4-r1
@@ -0,0 +1,3 @@
+MD5 4c85f65734e3308d3f3b09fe36b689cb prokyon3-0.9.4.tar.gz 1230467
+RMD160 49f00440de9698def2a5f13c2405d354abc47f71 prokyon3-0.9.4.tar.gz 1230467
+SHA256 57e5e9d67a81e171120de7de8f70eca575d10cadacbddab76a2eaf9d025f61fa prokyon3-0.9.4.tar.gz 1230467
diff --git a/media-sound/prokyon3/files/prokyon3-0.9.4-gcc41.patch b/media-sound/prokyon3/files/prokyon3-0.9.4-gcc41.patch
new file mode 100644
index 000000000000..b9252417d1d3
--- /dev/null
+++ b/media-sound/prokyon3/files/prokyon3-0.9.4-gcc41.patch
@@ -0,0 +1,26 @@
+diff -Naur prokyon3-0.9.4.orig/src/configuration.h prokyon3-0.9.4/src/configuration.h
+--- prokyon3-0.9.4.orig/src/configuration.h	2005-11-14 23:03:49.000000000 +0900
++++ prokyon3-0.9.4/src/configuration.h	2006-10-15 14:06:01.000000000 +0900
+@@ -159,8 +159,8 @@
+   ~Configuration();
+ 
+  private:
+-  QValueList<int> Configuration::listString2Int( QStringList qs);
+-  QStringList Configuration::listInt2String( QValueList<int> qi);
++  QValueList<int> listString2Int( QStringList qs);
++  QStringList listInt2String( QValueList<int> qi);
+   int startuptip, readid3v2, writeid3v2, autoconn, autohide, avoidhdd, avoidsmb, avoidnfs;
+ #ifdef HAVE_MEXTRAS
+   int checkartist, checkcover, checklyrics, checkalbum, checktracks, checkbiography, checkyears;
+diff -Naur prokyon3-0.9.4.orig/src/progressdialogscroll.h prokyon3-0.9.4/src/progressdialogscroll.h
+--- prokyon3-0.9.4.orig/src/progressdialogscroll.h	2005-11-14 22:57:18.000000000 +0900
++++ prokyon3-0.9.4/src/progressdialogscroll.h	2006-10-15 14:06:21.000000000 +0900
+@@ -32,7 +32,7 @@
+ 		        setMinimumHeight( 200 ); 
+ 		        setMinimumWidth( 500 );
+               }
+-   void ProgressDialogScroll::resizeEvent( QResizeEvent *ev ) {
++   void resizeEvent( QResizeEvent *ev ) {
+                      QProgressDialog::resizeEvent( ev );
+ 		     QRect rct = static_cast<QWidget*>(this->child("label","QLabel"))->geometry();
+                      rct.setTop(2);
diff --git a/media-sound/prokyon3/prokyon3-0.9.4-r1.ebuild b/media-sound/prokyon3/prokyon3-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..975a37c72ea0
--- /dev/null
+++ b/media-sound/prokyon3/prokyon3-0.9.4-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/prokyon3-0.9.4-r1.ebuild,v 1.1 2006/10/16 14:20:20 matsuu Exp $
+
+inherit qt3 eutils
+
+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 vorbis"
+
+DEPEND="$(qt_min_version 3.2)
+	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}-gcc41.patch
+}
+
+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}	|| 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
+	einfo "Prokyon3 supports the following external programs"
+	einfo "to play audio tracks:"
+	einfo " - media-sound/amarok"
+	einfo " - media-sound/beep-media-player"
+	einfo " - media-video/kaffeine"
+	einfo " - media-video/mplayer"
+	einfo " - kde-base/noatun or kde-base/kdemultimedia"
+	einfo " - media-video/totem"
+	einfo " - media-sound/xmms"
+	einfo
+	einfo "Prokyon3 also supports the following external"
+	einfo "applications, if installed:"
+	einfo " - app-cdr/k3b:          CD burning"
+	einfo " - media-sound/mixxx:    DJ mixing"
+	echo
+}