Dont make use of the deprecated oggvorbis useflag any longer, see #94254.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 30 insertions, 65 deletions

diff --git a/media-sound/prokyon3/ChangeLog b/media-sound/prokyon3/ChangeLog
index b87ebc045e72..56cd24bdebe3 100644
--- a/media-sound/prokyon3/ChangeLog
+++ b/media-sound/prokyon3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/prokyon3
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/ChangeLog,v 1.9 2005/04/03 22:53:50 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/ChangeLog,v 1.10 2005/05/28 14:45:50 luckyduck Exp $
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -prokyon3-0.9.1_p1.ebuild, prokyon3-0.9.2.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
 
   03 Apr 2005; Gregorio Guidi <greg_g@gentoo.org>
   +files/prokyon3-0.9.2-configure.patch, prokyon3-0.9.2.ebuild:
diff --git a/media-sound/prokyon3/Manifest b/media-sound/prokyon3/Manifest
index fa80184b305a..9ee702abd8c8 100644
--- a/media-sound/prokyon3/Manifest
+++ b/media-sound/prokyon3/Manifest
@@ -1,7 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 eb0c3bd1a1f05490ada2b1b0a26b1e06 prokyon3-0.9.2.ebuild 1226
+MD5 29498daa01168dc34bc6d54b8b7ae7dd ChangeLog 1361
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 94acbf833c6821f214cec9c259a7a20d ChangeLog 1176
-MD5 4de217bd6e9cd8b8285e47e85342d030 prokyon3-0.9.2.ebuild 1236
-MD5 bc82f008197e2528461f04071c4c667e prokyon3-0.9.1_p1.ebuild 1135
-MD5 88a53dd6a990b742c66c0ea184227b76 files/digest-prokyon3-0.9.1_p1 69
 MD5 36244c92298faae6859f3d5903662043 files/prokyon3-0.9.2-configure.patch 842
 MD5 f3d88c9c9bb8a1b5375a1f1be1ac0dba files/digest-prokyon3-0.9.2 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCmIQ306ebR+OMO78RAuwdAJ4vKdtwNVnAyg1nnnFQDlqUpuLPSwCdFHiu
+J2NDfBgJ2eeDToia0/2Thzs=
+=tEI1
+-----END PGP SIGNATURE-----
diff --git a/media-sound/prokyon3/files/digest-prokyon3-0.9.1_p1 b/media-sound/prokyon3/files/digest-prokyon3-0.9.1_p1
deleted file mode 100644
index f5dba7f8ea96..000000000000
--- a/media-sound/prokyon3/files/digest-prokyon3-0.9.1_p1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 767f849e9ba4c5c4ec114f64ecf1824b prokyon3-0.9.1-r1.tar.gz 353440
diff --git a/media-sound/prokyon3/prokyon3-0.9.1_p1.ebuild b/media-sound/prokyon3/prokyon3-0.9.1_p1.ebuild
deleted file mode 100644
index fd9f55459bc8..000000000000
--- a/media-sound/prokyon3/prokyon3-0.9.1_p1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/prokyon3-0.9.1_p1.ebuild,v 1.6 2004/06/25 00:17:30 agriffis Exp $
-
-IUSE="oggvorbis"
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Multithreaded MP3 manager and tag editor based on Qt and MySQL"
-HOMEPAGE="http://prokyon3.sourceforge.net"
-SRC_URI="mirror://sourceforge/prokyon3/${PN}-${PV/_p/-r}.tar.gz"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND=">=x11-libs/qt-3.0
-	dev-db/mysql
-	>=media-libs/id3lib-3.8.2
-	oggvorbis? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if [ ! -e ${QTDIR}/plugins/sqldrivers/libqsqlmysql.so ] ; then
-		eerror "You have installed Qt without MySQL support."
-		eerror "Please make sure "mysql" is in your USE variable"
-		eerror "and reemerge Qt"
-		die "MySQL support for Qt not found"
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	use oggvorbis || myconf="--without-ogg"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install () {
-	einstall || die
-	dodoc ChangeLog COPYING INSTALL NEWS README
-}
diff --git a/media-sound/prokyon3/prokyon3-0.9.2.ebuild b/media-sound/prokyon3/prokyon3-0.9.2.ebuild
index d8927d711154..2b4e740013d7 100644
--- a/media-sound/prokyon3/prokyon3-0.9.2.ebuild
+++ b/media-sound/prokyon3/prokyon3-0.9.2.ebuild
@@ -1,27 +1,28 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/prokyon3-0.9.2.ebuild,v 1.6 2005/04/03 22:53:50 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/prokyon3/prokyon3-0.9.2.ebuild,v 1.7 2005/05/28 14:45:50 luckyduck Exp $
 
 inherit eutils
 
 DESCRIPTION="Multithreaded MP3 manager and tag editor based on Qt and MySQL"
 HOMEPAGE="http://prokyon3.sourceforge.net"
 SRC_URI="mirror://sourceforge/prokyon3/${P}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc amd64"
-IUSE="oggvorbis"
+IUSE="ogg"
+
+RESTRICT="primaryuri"
 
 DEPEND=">=x11-libs/qt-3.0
 	dev-db/mysql
 	>=media-libs/id3lib-3.8.2
-	oggvorbis? ( >=media-libs/libogg-1.0
+	ogg? ( >=media-libs/libogg-1.0
 		>=media-libs/libvorbis-1.0 )"
 
 pkg_setup() {
-	if [ ! -e ${QTDIR}/plugins/sqldrivers/libqsqlmysql.so ] ; then
+	if has_version qt && ! built_with_use qt mysql ; then
 		eerror "You have installed Qt without MySQL support."
 		eerror "Please make sure "mysql" is in your USE variable"
 		eerror "and reemerge Qt"
@@ -38,15 +39,14 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-
-	use oggvorbis || myconf="--without-ogg"
+	econf \
+		$(use_with ogg) \
+		|| die "configure failed"
 
-	econf ${myconf} || die
-	emake || die
+	emake || die "make failed"
 }
 
 src_install () {
-	einstall || die
-	dodoc ChangeLog COPYING INSTALL NEWS README
+	einstall || die "make install failed"
+	dodoc ChangeLog INSTALL NEWS README
 }