Fixed gcc-4.1 compile issue, bug 140999.

Package-Manager: portage-2.1.1-r1

6 files changed, 151 insertions, 23 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/Manifest b/media-sound/prokyon3/Manifest
index c62ae72ada32..450936a331c8 100644
--- a/media-sound/prokyon3/Manifest
+++ b/media-sound/prokyon3/Manifest
@@ -1,31 +1,39 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 84031c09adeb00d75cf1c0410a000cec ChangeLog 1979
-RMD160 aa878f416d131a9bc2e379e1a29f066d5a4d7af6 ChangeLog 1979
-SHA256 81d7562d19aea1190abe63a694d0f151b9136f51d80aef969ead058196c77a48 ChangeLog 1979
-MD5 f3d88c9c9bb8a1b5375a1f1be1ac0dba files/digest-prokyon3-0.9.2 66
-RMD160 13cd4c387baec3521d5cf70aee192afd6240ad6e files/digest-prokyon3-0.9.2 66
-SHA256 4c02a11cd3cf7d42d8d8ef3f6d86657fb538b5afb658c18da47c29e744a6d05b files/digest-prokyon3-0.9.2 66
-MD5 2d8d79e0a74178672f513a48353a9ec9 files/digest-prokyon3-0.9.4 67
-RMD160 d3ab39ce8820c1a77b3ca99d01d7fc07768a25c9 files/digest-prokyon3-0.9.4 67
-SHA256 15f2bd809afeba76b6340fd668c6328802da931428388af3353d9f2c4528b604 files/digest-prokyon3-0.9.4 67
+AUX prokyon3-0.9.2-configure.patch 842 RMD160 71ec4e39e7d687c1b0649df05571bc22df9a7509 SHA1 cbbdab2046e2ba2bc3f9f0198612dafaeffe6895 SHA256 8018ed99bfc68a2ba9ce869d34635cfe4c2c0e2e2714ea9b91775ccfea87ccf7
 MD5 36244c92298faae6859f3d5903662043 files/prokyon3-0.9.2-configure.patch 842
 RMD160 71ec4e39e7d687c1b0649df05571bc22df9a7509 files/prokyon3-0.9.2-configure.patch 842
 SHA256 8018ed99bfc68a2ba9ce869d34635cfe4c2c0e2e2714ea9b91775ccfea87ccf7 files/prokyon3-0.9.2-configure.patch 842
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
-SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+AUX prokyon3-0.9.4-gcc41.patch 1409 RMD160 9bf460cdd8f00b90142d5b2289735c9107f9f591 SHA1 8117e0617f3a7419bf379b6410082df8ae29302e SHA256 8d8763a994789698bad338fa587aff72c4a2b05d1fbe5f38c48b4632d95afa36
+MD5 5962bc987ab4fbc899ad428bb646683e files/prokyon3-0.9.4-gcc41.patch 1409
+RMD160 9bf460cdd8f00b90142d5b2289735c9107f9f591 files/prokyon3-0.9.4-gcc41.patch 1409
+SHA256 8d8763a994789698bad338fa587aff72c4a2b05d1fbe5f38c48b4632d95afa36 files/prokyon3-0.9.4-gcc41.patch 1409
+DIST prokyon3-0.9.2.tar.gz 593348
+DIST prokyon3-0.9.4.tar.gz 1230467 RMD160 49f00440de9698def2a5f13c2405d354abc47f71 SHA1 a57b1ab8c3094e786b5f05b0cc7637e57042971a SHA256 57e5e9d67a81e171120de7de8f70eca575d10cadacbddab76a2eaf9d025f61fa
+EBUILD prokyon3-0.9.2.ebuild 1230 RMD160 8a770a4cd1b26d43cda7f7bc5a8f476a336856b2 SHA1 2db984331d7089bd9f48263e83eeb6c4307648ab SHA256 dbb8b0a207748062ba09ddd8d3796efbfcddc42e2cc5f75c60766004573e329a
 MD5 711b2f6e47dd86dfd6cc4a1e618956c6 prokyon3-0.9.2.ebuild 1230
 RMD160 8a770a4cd1b26d43cda7f7bc5a8f476a336856b2 prokyon3-0.9.2.ebuild 1230
 SHA256 dbb8b0a207748062ba09ddd8d3796efbfcddc42e2cc5f75c60766004573e329a prokyon3-0.9.2.ebuild 1230
+EBUILD prokyon3-0.9.4-r1.ebuild 2152 RMD160 b92d8baad63dd2a853343db3f900f0cdc143f7b3 SHA1 ad6cfb7ea7427eb5d1097bc32442d32b187d62bb SHA256 bca2e619a4e67542c3c1cecaa2e99b0b7bfb86245713a13aa69c50c0d1093854
+MD5 084fe0cc01ccb6a3f374c5ecaa5cdebf prokyon3-0.9.4-r1.ebuild 2152
+RMD160 b92d8baad63dd2a853343db3f900f0cdc143f7b3 prokyon3-0.9.4-r1.ebuild 2152
+SHA256 bca2e619a4e67542c3c1cecaa2e99b0b7bfb86245713a13aa69c50c0d1093854 prokyon3-0.9.4-r1.ebuild 2152
+EBUILD prokyon3-0.9.4.ebuild 2057 RMD160 e73930fe4c3c19f4dbe72a43224b9e0afb8353c8 SHA1 5fd82279bb1551f7be6eead24eb9805b36003f5e SHA256 87c6021e51ed70a1bd10c8a62af8e52b13d21b2c4e21159e37eaa990a9ea600d
 MD5 c23540c515902080bb097228640849c1 prokyon3-0.9.4.ebuild 2057
 RMD160 e73930fe4c3c19f4dbe72a43224b9e0afb8353c8 prokyon3-0.9.4.ebuild 2057
 SHA256 87c6021e51ed70a1bd10c8a62af8e52b13d21b2c4e21159e37eaa990a9ea600d prokyon3-0.9.4.ebuild 2057
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEDz7VAiZjviIA2XgRAnEqAJ0ZKggI7bpr58TQDjzVwdnyPSs1nACgpcsV
-7sMBX3PqFMB6w0bqxX8Reno=
-=Br5q
------END PGP SIGNATURE-----
+MISC ChangeLog 2167 RMD160 a140994b7560417dfe4258663a3036ac0dc71e3e SHA1 4ba51afe8822f199696d478fde347f44603058e9 SHA256 8ab64664e936279ac82ced8e3301c48cc4497172fc58bae0cdfc7f869a86d68d
+MD5 847f3654c848c5e29230f754fcbc4347 ChangeLog 2167
+RMD160 a140994b7560417dfe4258663a3036ac0dc71e3e ChangeLog 2167
+SHA256 8ab64664e936279ac82ced8e3301c48cc4497172fc58bae0cdfc7f869a86d68d ChangeLog 2167
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+MD5 f3d88c9c9bb8a1b5375a1f1be1ac0dba files/digest-prokyon3-0.9.2 66
+RMD160 13cd4c387baec3521d5cf70aee192afd6240ad6e files/digest-prokyon3-0.9.2 66
+SHA256 4c02a11cd3cf7d42d8d8ef3f6d86657fb538b5afb658c18da47c29e744a6d05b files/digest-prokyon3-0.9.2 66
+MD5 0ff9a30951d81fe3a581aed9c5ba8d72 files/digest-prokyon3-0.9.4 247
+RMD160 1f49fa887d6165f0f0d7dfdb48397034a7955e6c files/digest-prokyon3-0.9.4 247
+SHA256 c2b22bb5f77b13923800ad05684da8ca4f288bca571c13da8efd9f14664dfbb6 files/digest-prokyon3-0.9.4 247
+MD5 0ff9a30951d81fe3a581aed9c5ba8d72 files/digest-prokyon3-0.9.4-r1 247
+RMD160 1f49fa887d6165f0f0d7dfdb48397034a7955e6c files/digest-prokyon3-0.9.4-r1 247
+SHA256 c2b22bb5f77b13923800ad05684da8ca4f288bca571c13da8efd9f14664dfbb6 files/digest-prokyon3-0.9.4-r1 247
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
+}