New version. Big ebuild restructuring, reflecting the fact that yammi is now a KDE application.

Package-Manager: portage-2.0.51.19

10 files changed, 83 insertions, 233 deletions

diff --git a/media-sound/yammi/ChangeLog b/media-sound/yammi/ChangeLog
index 61dd68882727..89ff5a0f6ce0 100644
--- a/media-sound/yammi/ChangeLog
+++ b/media-sound/yammi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/yammi
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.21 2005/01/29 17:06:03 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/ChangeLog,v 1.22 2005/03/15 21:12:48 greg_g Exp $
+
+*yammi-1.2 (15 Mar 2005)
+
+  15 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> metadata.xml,
+  -files/yammi-0.8.2-qt.patch, -yammi-0.8.2.ebuild, -yammi-1.0.ebuild,
+  +yammi-1.2.ebuild:
+  New version. Big ebuild restructuring, reflecting the fact that yammi is now a
+  KDE application.
 
   29 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> yammi-0.8.2.ebuild,
   yammi-1.0-r1.ebuild, yammi-1.0.ebuild:
diff --git a/media-sound/yammi/Manifest b/media-sound/yammi/Manifest
index e4f88bb427fa..e6deafb83c6b 100644
--- a/media-sound/yammi/Manifest
+++ b/media-sound/yammi/Manifest
@@ -1,11 +1,8 @@
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 0ec45e30331926000644355fcba58782 ChangeLog 3540
-MD5 c9f88b33d3dacb7adb3ca03d8898e810 yammi-0.8.2.ebuild 2146
-MD5 2fc9dca7fab11c6d94e7e2f7f65e3a03 yammi-1.0.ebuild 2107
+MD5 d9eae2ed5a4e04f174150ff84706b075 metadata.xml 181
+MD5 29e2b577761f5fbc677f980851f258d5 ChangeLog 3823
+MD5 76115a543f3eb8016145128930e4fe07 yammi-1.2.ebuild 1820
 MD5 922e479626bb6ea3e14835d7eb54cf87 yammi-1.0-r1.ebuild 2169
-MD5 03f044ad1784731e428fc3751a8b212b files/digest-yammi-0.8.2 68
-MD5 0a437edbb0076d7d120eb70648c04fc3 files/yammi-0.8.2-qt.patch 1669
 MD5 dddb69fe8545cfaaf5c307b5bb80df75 files/yammi-1.0-traverse.patch 593
-MD5 9c22722989a753ad61b3b764925f252a files/digest-yammi-1.0 61
+MD5 3b3a8303b5885223b0416428f9d07009 files/digest-yammi-1.2 62
 MD5 3f815698af1d6b4efd7b6e08498cbef3 files/yammi-1.0-qt.patch 2173
 MD5 9c22722989a753ad61b3b764925f252a files/digest-yammi-1.0-r1 61
diff --git a/media-sound/yammi/files/digest-yammi-0.8.2 b/media-sound/yammi/files/digest-yammi-0.8.2
deleted file mode 100644
index b8b39391dedd..000000000000
--- a/media-sound/yammi/files/digest-yammi-0.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 abaaa7a0b04fbb9a348334f5b496d76e yammi-0.8.2fixed.tar.gz 800254
diff --git a/media-sound/yammi/files/digest-yammi-1.0 b/media-sound/yammi/files/digest-yammi-1.0
deleted file mode 100644
index 1449497dc0e5..000000000000
--- a/media-sound/yammi/files/digest-yammi-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 890923181d6d0f650790b004b2948864 yammi-1.0.tar.gz 928695
diff --git a/media-sound/yammi/files/digest-yammi-1.2 b/media-sound/yammi/files/digest-yammi-1.2
new file mode 100644
index 000000000000..c2129450d191
--- /dev/null
+++ b/media-sound/yammi/files/digest-yammi-1.2
@@ -0,0 +1 @@
+MD5 4479edc26eeee5c4592eeb849a849270 yammi-1.2.tar.gz 1169578
diff --git a/media-sound/yammi/files/yammi-0.8.2-qt.patch b/media-sound/yammi/files/yammi-0.8.2-qt.patch
deleted file mode 100644
index c03056ce4901..000000000000
--- a/media-sound/yammi/files/yammi-0.8.2-qt.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ur yammi-0.8.2/configure yammi-0.8.2-gentoo/configure
---- yammi-0.8.2/configure	2003-05-16 04:14:30.000000000 +1200
-+++ yammi-0.8.2-gentoo/configure	2003-10-05 19:22:33.000000000 +1300
-@@ -1718,7 +1718,7 @@
-  id3lib support .......: $configure_enable_id3lib
-  " >&6;}
- 
--if test "x$configure_enable_KDE" = "xyes"; then
-+#if test "x$configure_enable_KDE" = "xyes"; then
- 
-   unset CDPATH
- 
-@@ -1807,7 +1807,7 @@
-    kde_qt_dirs="$QTDIR /usr/lib/qt"
- fi
- 
--fi
-+#fi
- 
- ac_config_commands="$ac_config_commands default-1"
- 
-@@ -15248,9 +15248,9 @@
- # AC_SUBST(all_includes)
- # AC_SUBST(all_libraries)
- 
--if test "x$configure_enable_KDE" = "xyes"; then
--    { echo "$as_me:15252: Adding KDE support " >&5
--echo "$as_me: Adding KDE support " >&6;}
-+#if test "x$configure_enable_KDE" = "xyes"; then
-+#    { echo "$as_me:15252: Adding KDE support " >&5
-+#echo "$as_me: Adding KDE support " >&6;}
- 
-     # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
-@@ -15379,9 +15379,9 @@
- 	fi
-       fi
- 
--fi
-+#fi
- 
--if test "x$configure_enable_KDE" = "xyes"; then
-+#if test "x$configure_enable_KDE" = "xyes"; then
-     echo "$as_me:15385: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-@@ -21157,7 +21157,7 @@
- 
- fi
- 
--else
-+elif test "x$configure_enable_KDE" = "xyes"; then
- 
- # Check whether --enable-mt or --disable-mt was given.
- if test "${enable_mt+set}" = set; then
-@@ -21987,7 +21987,7 @@
- fi
- test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
- 
--fi
-+#fi
- 
- if test "x$configure_enable_KDE" = "xyes"; then
- 
diff --git a/media-sound/yammi/metadata.xml b/media-sound/yammi/metadata.xml
index e1774e3d9ad7..13f11feaf07e 100644
--- a/media-sound/yammi/metadata.xml
+++ b/media-sound/yammi/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
+<herd>kde-other</herd>
 </pkgmetadata>
diff --git a/media-sound/yammi/yammi-0.8.2.ebuild b/media-sound/yammi/yammi-0.8.2.ebuild
deleted file mode 100644
index 4bd0c836684c..000000000000
--- a/media-sound/yammi/yammi-0.8.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-0.8.2.ebuild,v 1.17 2005/01/29 17:06:03 greg_g Exp $
-
-inherit flag-o-matic eutils kde-functions
-
-DESCRIPTION="MP3/Ogg/Wav-Manager and Jukebox 4 XMMS/Noatun"
-HOMEPAGE="http://yammi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/yammi/${P}fixed.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE="cdr xmms oggvorbis kde"
-
-DEPEND=">=x11-libs/qt-3.1.0-r1
-	>=media-libs/id3lib-3.8.2
-	>=media-sound/cdparanoia-3.9.8
-	>=media-sound/lame-3.93.1
-	virtual/mpg123
-	>=media-sound/sox-12.17.3-r1
-	cdr? ( >=app-cdr/cdlabelgen-2.4.0 >=app-cdr/mp3burn-0.1 )
-	xmms? ( >=media-sound/xmms-1.2.7-r18 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 )
-	kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.4 ) )"
-
-src_unpack() {
-	unpack ${P}fixed.tar.gz
-	epatch ${FILESDIR}/${P}-qt.patch
-}
-
-src_compile() {
-	set-qtdir 3
-	set-kdedir 3
-
-	# need to filter -fomit-frame-pointer for pentium II
-	is-flag "-march=pentium2" && filter-flags "-fomit-frame-pointer"
-
-	#needed to let configure detect the id3libs correct
-	export LDFLAGS="-lstdc++"
-
-	local myconf
-	use xmms || myconf="--disable-xmms"
-	use kde || myconf="--disable-KDE --disable-noatun ${myconf}"
-
-	if ! use xmms && ! use kde
-	then
-		myconf="--disable-ogglibs ${myconf}"
-	else
-		use oggvorbis || myconf="--disable-oogvorbis ${myconf}"
-	fi
-
-	econf ${myconf} || die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=$D install || die
-	dodoc AUTHORS CHANGELOG CREDITS INSTALL README TODO
-}
-
-pkg_postinst() {
-	if ! use kde && ! use xmms
-	then
-		ewarn "Yammi is compiled without support for xmms and noatun."
-		ewarn "Now the functionality of Yammi is very limited."
-		ewarn "It is highly recommended to recompile Yammi."
-		ewarn
-		ewarn "To get xmms support:"
-		ewarn "$ export USE=\"xmms\""
-		ewarn
-		ewarn "To get noatun support:"
-		ewarn "$ export USE=\"kde\""
-		ewarn
-		ewarn "Or to get support for both:"
-		ewarn "$ export USE=\"xmms kde\""
-	fi
-}
diff --git a/media-sound/yammi/yammi-1.0.ebuild b/media-sound/yammi/yammi-1.0.ebuild
deleted file mode 100644
index c02c21e591e2..000000000000
--- a/media-sound/yammi/yammi-1.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.0.ebuild,v 1.11 2005/01/29 17:06:03 greg_g Exp $
-
-inherit flag-o-matic eutils kde-functions
-
-DESCRIPTION="MP3/Ogg/Wav-Manager and Jukebox 4 XMMS/Noatun"
-HOMEPAGE="http://yammi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/yammi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE="cdr xmms oggvorbis kde"
-
-DEPEND=">=x11-libs/qt-3.1.0-r1
-	>=media-libs/id3lib-3.8.2
-	>=media-sound/cdparanoia-3.9.8
-	>=media-sound/lame-3.93.1
-	virtual/mpg123
-	>=media-sound/sox-12.17.3-r1
-	cdr? ( >=app-cdr/cdlabelgen-2.4.0 >=app-cdr/mp3burn-0.1 )
-	xmms? ( >=media-sound/xmms-1.2.7-r18 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 >=media-sound/vorbis-tools-1.0-r1 )
-	kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.0.4 ) )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-qt.patch
-}
-
-src_compile() {
-	set-qtdir 3
-	set-kdedir 3
-
-	# need to filter -fomit-frame-pointer for pentium II
-	is-flag "-march=pentium2" && filter-flags "-fomit-frame-pointer"
-
-	#needed to let configure detect the id3libs correct
-	export LDFLAGS="-lstdc++"
-
-	local myconf
-	use xmms || myconf="--disable-xmms"
-	use kde || myconf="--disable-KDE --disable-noatun ${myconf}"
-
-	if ! use xmms && ! use kde
-	then
-		myconf="--disable-ogglibs ${myconf}"
-	else
-		use oggvorbis || myconf="--disable-oogvorbis ${myconf}"
-	fi
-
-	econf ${myconf} || die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=$D install || die
-	dodoc AUTHORS CHANGELOG CREDITS INSTALL README TODO
-}
-
-pkg_postinst() {
-	if ! use kde && ! use xmms
-	then
-		ewarn "Yammi is compiled without support for xmms and noatun."
-		ewarn "Now the functionality of Yammi is very limited."
-		ewarn "It is highly recommended to recompile Yammi."
-		ewarn
-		ewarn "To get xmms support:"
-		ewarn "$ export USE=\"xmms\""
-		ewarn
-		ewarn "To get noatun support:"
-		ewarn "$ export USE=\"kde\""
-		ewarn
-		ewarn "Or to get support for both:"
-		ewarn "$ export USE=\"xmms kde\""
-	fi
-}
diff --git a/media-sound/yammi/yammi-1.2.ebuild b/media-sound/yammi/yammi-1.2.ebuild
new file mode 100644
index 000000000000..8126839793b0
--- /dev/null
+++ b/media-sound/yammi/yammi-1.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/yammi/yammi-1.2.ebuild,v 1.1 2005/03/15 21:12:48 greg_g Exp $
+
+inherit kde
+
+DESCRIPTION="MP3/Ogg/Wav-Manager and Jukebox"
+HOMEPAGE="http://yammi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/yammi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+IUSE="cdr encode kde oggvorbis xmms"
+
+DEPEND=">=media-libs/taglib-1.3
+	xmms? ( media-sound/xmms )"
+
+RDEPEND="${DEPEND}
+	kde? ( || ( kde-base/noatun kde-base/kdemultimedia ) )
+	media-sound/sox
+	virtual/mpg123
+	oggvorbis? ( media-sound/vorbis-tools )
+	encode? ( media-sound/cdparanoia
+		  media-sound/lame )"
+
+# sox, mpg123 and vorbis-tools are used for the 'prelisten' feature.
+# cdparanoia and lame are used by the yammiGrabAndEncode script.
+# gstreamer support is left out on purpose, since it is
+# based on the obsolete gst kde bindings.
+
+need-kde 3
+
+pkg_setup() {
+	if ! use arts && ! use xmms; then
+		eerror "Yammi needs either aRts or Xmms to work,"
+		eerror "please try again with USE=\"arts\" or USE=\"xmms\"".
+		die
+	fi
+
+	# check whether kdelibs was compiled with arts support
+	kde_pkg_setup
+}
+
+src_unpack() {
+	# override kde_src_unpack, to prevent automake from running
+	unpack ${A}
+}
+
+src_compile() {
+	myconf="$(use_enable xmms)"
+
+	kde_src_compile
+}
+
+pkg_postinst() {
+	echo
+	einfo "yammi provides various plugins based on"
+	einfo "external programs, you can emerge any of the"
+	einfo "following packages to make the correspondent plugin"
+	einfo "available:"
+	einfo
+	einfo "app-cdr/cdlabelgen:  create CD labels"
+	einfo "app-cdr/k3b:         burn CDs with K3b"
+	einfo "media-libs/tunepimp or media-sound/trm:"
+	einfo "                     lookup tracks on www.musicbrainz.org"
+	echo
+}