Version bumped. ebuild submitted by Felix Eckhofer <felix@tribut.de> in 32055

4 files changed, 165 insertions, 3 deletions

diff --git a/media-sound/yammi/Manifest b/media-sound/yammi/Manifest
index 70191bbf0abd..108b1b5e97ff 100644
--- a/media-sound/yammi/Manifest
+++ b/media-sound/yammi/Manifest
@@ -1,8 +1,8 @@
-MD5 e4f7b9d9c6dd1d58b4bdcdf8fd583d2f ChangeLog 1491
+MD5 34d59e99015c1c894fa09f68e0988441 ChangeLog 1694
 MD5 f877106731e930c0a05e95a28ae23017 yammi-0.8.2.ebuild 2111
-MD5 aa699e1a1c641511384029ac9c31f663 yammi-1.0.ebuild 2094
+MD5 ffd950d87a109cbcffa2182795308b78 yammi-1.0.ebuild 2093
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 9c22722989a753ad61b3b764925f252a files/digest-yammi-1.0 61
 MD5 03f044ad1784731e428fc3751a8b212b files/digest-yammi-0.8.2 68
 MD5 0a437edbb0076d7d120eb70648c04fc3 files/yammi-0.8.2-qt.patch 1669
-MD5 3f815698af1d6b4efd7b6e08498cbef3 files/attachment.cgi?id=21278 2173
+MD5 3f815698af1d6b4efd7b6e08498cbef3 files/yammi-1.0-qt.patch 2173
diff --git a/media-sound/yammi/files/digest-yammi-1.0 b/media-sound/yammi/files/digest-yammi-1.0
new file mode 100644
index 000000000000..1449497dc0e5
--- /dev/null
+++ b/media-sound/yammi/files/digest-yammi-1.0
@@ -0,0 +1 @@
+MD5 890923181d6d0f650790b004b2948864 yammi-1.0.tar.gz 928695
diff --git a/media-sound/yammi/files/yammi-1.0-qt.patch b/media-sound/yammi/files/yammi-1.0-qt.patch
new file mode 100644
index 000000000000..15b853bf8ba9
--- /dev/null
+++ b/media-sound/yammi/files/yammi-1.0-qt.patch
@@ -0,0 +1,82 @@
+--- yammi-1.0/configure	2003-10-24 19:03:54.000000000 +0200
++++ yammi-1.0-gentoo/configure	2003-11-25 21:28:32.000000000 +0100
+@@ -1725,7 +1725,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
+ 
+@@ -1814,7 +1814,7 @@
+    kde_qt_dirs="$QTDIR /usr/lib/qt"
+ fi
+ 
+-fi
++#fi
+ 
+ ac_config_commands="$ac_config_commands default-1"
+ 
+@@ -15250,9 +15250,9 @@
+ 
+ # Prevent multiple expansion
+ 
+-if test "x$configure_enable_KDE" = "xyes"; then
+-    { echo "$as_me:15254: Adding KDE support " >&5
+-echo "$as_me: Adding KDE support " >&6;}
++#if test "x$configure_enable_KDE" = "xyes"; then
++#    { echo "$as_me:15254: 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
+@@ -15381,9 +15381,9 @@
+ 	fi
+       fi
+ 
+-fi
++#fi
+ 
+-if test "x$configure_enable_KDE" = "xyes"; then
++#if test "x$configure_enable_KDE" = "xyes"; then
+     echo "$as_me:15387: 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
+@@ -19950,6 +19950,8 @@
+ echo "$as_me:19950: result: $USE_RPATH" >&5
+ echo "${ECHO_T}$USE_RPATH" >&6
+ 
++# yyy: hacked by oliver, start if block for non-kde systems
++if test "x$configure_enable_KDE" = "xyes"; then
+ echo "$as_me:19953: checking for KDE" >&5
+ echo $ECHO_N "checking for KDE... $ECHO_C" >&6
+ 
+@@ -21194,7 +21196,7 @@
+   fi
+ done
+ 
+-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
+@@ -21308,6 +21310,9 @@
+   LIBQT="$LIBQT $LIBDL"
+ fi
+ 
++fi
++# yyy: hacked by oliver, end if block for non-kde systems
++
+ echo "$as_me:21311: checking for Qt" >&5
+ echo $ECHO_N "checking for Qt... $ECHO_C" >&6
+ 
+@@ -22021,7 +22026,7 @@
+ fi
+ test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
+ 
+-fi
++#fi
+ 
+ echo "$as_me:22026: checking for main in -lstdc++" >&5
+ echo $ECHO_N "checking for main in -lstdc++... $ECHO_C" >&6
diff --git a/media-sound/yammi/yammi-1.0.ebuild b/media-sound/yammi/yammi-1.0.ebuild
new file mode 100644
index 000000000000..e39a758bd15a
--- /dev/null
+++ b/media-sound/yammi/yammi-1.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1 2003/12/18 23:02:31 mholzer Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="MP3/Ogg/Wav-Manager and Jukebox 4 XMMS/Noatun"
+HOMEPAGE="http://yammi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/yammi/${P}.tar.gz"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+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
+	>=media-sound/mpg123-0.59r-r1
+	>=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
+	>=vorbis-tools-1.0-r1 )
+	kde? ( >=kde-base/kdebase-3.0.4 )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-qt.patch
+}
+
+src_compile() {
+	# 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 [ -z "`use xmms`" ] && [ -z "`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 [ -z "`use kde`" ] && [ -z "`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
+}