new upstream version, fixes #90655. marked 2.0.2 stable on amd64 and x86, did some cleanup.

(Portage version: 2.0.51.20-r5)

11 files changed, 54 insertions, 212 deletions

diff --git a/media-plugins/xmms-imms/ChangeLog b/media-plugins/xmms-imms/ChangeLog
index 59f472bdde6f..f29f3013a697 100644
--- a/media-plugins/xmms-imms/ChangeLog
+++ b/media-plugins/xmms-imms/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/xmms-imms
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/ChangeLog,v 1.26 2005/04/09 17:18:07 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/ChangeLog,v 1.27 2005/04/29 15:26:31 luckyduck Exp $
+
+*xmms-imms-2.0.3 (29 Apr 2005)
+
+  29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/xmms-imms-1.0.1-gcc34.patch, -files/xmms-imms-1.0.1-makefile.patch,
+  +files/2.0.3-xorg.patch, -xmms-imms-1.0.1.ebuild, -xmms-imms-1.2a.ebuild,
+  xmms-imms-2.0.2.ebuild, +xmms-imms-2.0.3.ebuild:
+  new upstream version, fixes #90655. marked 2.0.2 stable on amd64 and x86,
+  did some cleanup.
 
   09 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -files/2.0.1-gentoo.patch,
   +files/2.0.2-xorg.patch, -xmms-imms-2.0.1.ebuild, xmms-imms-2.0.2.ebuild:
diff --git a/media-plugins/xmms-imms/Manifest b/media-plugins/xmms-imms/Manifest
index 096188c84467..4cc3679279bb 100644
--- a/media-plugins/xmms-imms/Manifest
+++ b/media-plugins/xmms-imms/Manifest
@@ -1,25 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 30319e7914cd8f2f17305f2d9d8d80d2 xmms-imms-1.0.1.ebuild 1114
-MD5 189f644e82685832cad77c697ced6fa7 xmms-imms-1.2a.ebuild 1108
 MD5 6e84d8a021671c144b0860c8c39750d0 xmms-imms-1.1.ebuild 1117
-MD5 c8a696821310513321a062c48a1fe5d9 xmms-imms-2.0.2.ebuild 1346
-MD5 122e3f097ae504b1261ff82aa3342476 ChangeLog 3885
+MD5 267ce3413893e3a7a364b25ff2d3e14d xmms-imms-2.0.3.ebuild 1340
+MD5 8419a5ac42811494b55aa1a87c402605 xmms-imms-2.0.2.ebuild 1343
+MD5 18eb67af323cbecd8adf046e71fef032 ChangeLog 4270
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 94ff3f9aff50a805fa9bfc3ca3a74658 files/xmms-imms-1.1-makefile.patch 2517
 MD5 5b150539965e8d54fbd01a73a683bff0 files/digest-xmms-imms-1.1 60
-MD5 de370ccf262cc471d299d6e6b6c90ea3 files/digest-xmms-imms-1.0.1 62
 MD5 3d1f3a0eb7144d8230e55f5968e0cd96 files/digest-xmms-imms-2.0.2 62
+MD5 5c71298a389ce9bcee576b62ef169c59 files/digest-xmms-imms-2.0.3 62
 MD5 49ca58eddd51ca3315cbb1c12a4ceff6 files/2.0.2-xorg.patch 383
-MD5 9fb82a2c977bec8a2596cd4b5c04c004 files/xmms-imms-1.0.1-makefile.patch 2451
-MD5 78e62c7ce406c6a3261d390f5cb5d48e files/xmms-imms-1.0.1-gcc34.patch 1144
+MD5 e5403b0fc1232e7de884fe7af6d709e0 files/2.0.3-xorg.patch 271
 MD5 adf2b4594ebdf6ecbb6fcccfb126db85 files/xmms-imms-1.1-gcc34.patch 590
-MD5 17836d39f8e03df1fb52254edcc6c455 files/digest-xmms-imms-1.2a 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCWA6Y06ebR+OMO78RAvDZAJ40SSt/6oVbrGG+2UdoweMJrduxtwCdHT6B
-1xupnsZH1V8+7S38+QrCLTM=
-=degE
------END PGP SIGNATURE-----
diff --git a/media-plugins/xmms-imms/files/2.0.3-xorg.patch b/media-plugins/xmms-imms/files/2.0.3-xorg.patch
new file mode 100644
index 000000000000..f99c98d2a891
--- /dev/null
+++ b/media-plugins/xmms-imms/files/2.0.3-xorg.patch
@@ -0,0 +1,10 @@
+--- vars.mk.in.orig	2005-04-29 17:06:59.000000000 +0200
++++ vars.mk.in	2005-04-29 17:07:15.000000000 +0200
+@@ -24,6 +24,6 @@
+ 
+ GLIB2LDFLAGS=`pkg-config glib-2.0 --libs`
+ GLIB1LDFLAGS=`pkg-config glib --libs`
+-LDFLAGS=-L. @LIBS@
++LDFLAGS=-lX11 -L. @LIBS@
+ 
+ default: all
diff --git a/media-plugins/xmms-imms/files/digest-xmms-imms-1.0.1 b/media-plugins/xmms-imms/files/digest-xmms-imms-1.0.1
deleted file mode 100644
index 01f7bf0f2a95..000000000000
--- a/media-plugins/xmms-imms/files/digest-xmms-imms-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1af7f78714ccc4fb2cbf50a02238aef2 imms-1.0.1.tar.bz2 45249
diff --git a/media-plugins/xmms-imms/files/digest-xmms-imms-1.2a b/media-plugins/xmms-imms/files/digest-xmms-imms-1.2a
deleted file mode 100644
index fbac08491d09..000000000000
--- a/media-plugins/xmms-imms/files/digest-xmms-imms-1.2a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af48ee1c967e26a93c34b423fbaf18b2 imms-1.2a.tar.bz2 52470
diff --git a/media-plugins/xmms-imms/files/digest-xmms-imms-2.0.3 b/media-plugins/xmms-imms/files/digest-xmms-imms-2.0.3
new file mode 100644
index 000000000000..355e4d7fbee7
--- /dev/null
+++ b/media-plugins/xmms-imms/files/digest-xmms-imms-2.0.3
@@ -0,0 +1 @@
+MD5 6b76a2000761d9c5034dcb2e71128624 imms-2.0.3.tar.bz2 57796
diff --git a/media-plugins/xmms-imms/files/xmms-imms-1.0.1-gcc34.patch b/media-plugins/xmms-imms/files/xmms-imms-1.0.1-gcc34.patch
deleted file mode 100644
index 7745d968f4d5..000000000000
--- a/media-plugins/xmms-imms/files/xmms-imms-1.0.1-gcc34.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naur imms-1.0.1.orig/immstool.cc imms-1.0.1/immstool.cc
---- imms-1.0.1.orig/immstool.cc	2004-02-25 12:53:33.000000000 -0800
-+++ imms-1.0.1/immstool.cc	2004-06-28 02:03:18.703330999 -0700
-@@ -4,6 +4,7 @@
- #include <list>
- #include <utility>
- 
-+#include <math.h>
- #include <assert.h>
- #include <stdlib.h>
- #include <unistd.h>
-diff -Naur imms-1.0.1.orig/strmanip.h imms-1.0.1/strmanip.h
---- imms-1.0.1.orig/strmanip.h	2004-02-25 12:53:33.000000000 -0800
-+++ imms-1.0.1/strmanip.h	2004-06-28 02:04:14.096265724 -0700
-@@ -25,7 +25,7 @@
-     ostringstream str;
-     str << i;
-     return str.str();
--};
-+}
- 
- // Double up single quotes to escape them sqlite style
- inline string escape_string(const string &in)
-@@ -57,7 +57,7 @@
-     if (hours)
-         s << hours << "h";
-     return s.str();
--};               
-+}               
- 
- inline string string_tolower(string s)
- {
-@@ -65,7 +65,7 @@
-        *i = tolower(*i);
- 
-     return s;
--};
-+}
- 
- inline string string_brfilter(string s)
- {
-@@ -90,7 +90,7 @@
-         }
-     }
-     return news;
--};            
-+}
- 
- string string_normalize(string s);
- string title_filter(const string &title);
diff --git a/media-plugins/xmms-imms/files/xmms-imms-1.0.1-makefile.patch b/media-plugins/xmms-imms/files/xmms-imms-1.0.1-makefile.patch
deleted file mode 100644
index 2d1c60c860dc..000000000000
--- a/media-plugins/xmms-imms/files/xmms-imms-1.0.1-makefile.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Naur imms-1.0.1.orig/rules.mk imms-1.0.1/rules.mk
---- imms-1.0.1.orig/rules.mk	2004-02-25 12:53:33.000000000 -0800
-+++ imms-1.0.1/rules.mk	2004-02-26 23:14:22.000000000 -0800
-@@ -11,12 +11,12 @@
- 	$(AR) $(ARFLAGS) $@ $(CORE_OBJ)
- 
- %.o: %.cc vars.mk
--	@$(CXX) $(CXXFLAGS) -M -E $< > .$*.d
--	$(CXX) $(CXXFLAGS) -c $< -o $@
-+	@$(CXX) $(CPPFLAGS) $(CXXFLAGS) -M -E $< > .$*.d
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
- 
- %.o: %.c vars.mk
--	@$(CXX) $(CFLAGS) -M -E $< > .$*.d
--	$(CC) $(CFLAGS) -c $< -o $@
-+	@$(CC) $(CPPFLAGS) $(CFLAGS) -M -E $< > .$*.d
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
- 
- .PHONY: clean distclean
- 
-@@ -44,26 +44,8 @@
- 	tar -C /tmp/ -cz imms-$(VERSION)/ -f imms-$(VERSION).tar.gz
- 	rm -rf /tmp/imms-$(VERSION)/
- 
--.PHONY: install install-user install-system user-message system-message
-+.PHONY: install
- 
--ifeq ($(shell id -u), 0)
--    install: system-message install-system
--else
--    install: user-message install-user
--endif
--
--system-message:
--	$(warning Defaulting to installing for all users.)
--	$(warning Use 'make install-user' to install for the current user only.)
--
--install-system: libimms.so
-+install: all
-+	mkdir -p ${DESTDIR}`xmms-config --visualization-plugin-dir`
- 	${INSTALL_PROGRAM} libimms.so ${DESTDIR}`xmms-config --visualization-plugin-dir`
--
--user-message:
--	$(warning Defaulting to installing for current user only.)
--	$(warning Use 'make install-system' to install for all users.)
--
--install-user: libimms.so
--	mkdir -p ${HOME}/.xmms/Plugins/Visualization/
--	rm -f ${HOME}/.xmms/Plugins/General/libimms.so
--	${INSTALL_PROGRAM} libimms.so ${HOME}/.xmms/Plugins/Visualization/
-diff -Naur imms-1.0.1.orig/vars.mk.in imms-1.0.1/vars.mk.in
---- imms-1.0.1.orig/vars.mk.in	2004-02-25 12:53:33.000000000 -0800
-+++ imms-1.0.1/vars.mk.in	2004-02-26 23:14:22.000000000 -0800
-@@ -2,15 +2,15 @@
- CXX = @CXX@
- VERSION = @PACKAGE_VERSION@
- INSTALL_PROGRAM = @INSTALL@
--DESTDIR = @prefix@
- 
- SHELL = bash
- XMMS_OBJ = plugin.o interface.o libimmscore.a 
- CORE_OBJ = imms.o immsdb.o fetcher.o picker.o spectrum.o sqldb.o \
- 	   songinfo.o regexx.o strmanip.o levenshtein.o xidle.o md5.o
- 
--CFLAGS = `xmms-config --cflags` @DEBUG_CFLAGS@ -Wall -fPIC -D_REENTRANT
--CXXFLAGS = ${CFLAGS} -pedantic -fno-rtti
-+CPPFLAGS = `xmms-config --cflags` @CPPFLAGS@
-+CFLAGS = -Wall -fPIC -D_REENTRANT @CFLAGS@ 
-+CXXFLAGS = -fPIC -D_REENTRANT -pedantic -fno-rtti @CXXFLAGS@
- LDFLAGS = `xmms-config --libs` @LIBS@
- ARFLAGS = rs
- 
diff --git a/media-plugins/xmms-imms/xmms-imms-1.0.1.ebuild b/media-plugins/xmms-imms/xmms-imms-1.0.1.ebuild
deleted file mode 100644
index 72e5545a302b..000000000000
--- a/media-plugins/xmms-imms/xmms-imms-1.0.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/xmms-imms-1.0.1.ebuild,v 1.9 2005/01/24 17:20:28 luckyduck Exp $
-
-inherit eutils
-
-MY_P=${P/xmms-/}
-
-DESCRIPTION="intelligent XMMS playlist plug-in that tracks your listening patterns and dynamically adapts to your taste"
-HOMEPAGE="http://www.luminal.org/phpwiki/index.php/IMMS"
-SRC_URI="mirror://sourceforge/imms/${MY_P}.tar.bz2"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
-
-IUSE="oggvorbis"
-
-RDEPEND="=dev-db/sqlite-2*
-	>=media-libs/id3lib-3.8
-	>=media-sound/xmms-1.2.7-r20
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )
-	>=dev-libs/libpcre-4.3"
-
-DEPEND="$RDEPEND
-	>=sys-devel/autoconf-2.5
-	>=sys-apps/sed-4.0.7"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-makefile.patch
-	epatch ${FILESDIR}/${P}-gcc34.patch
-
-	WANT_AUTOCONF=2.5
-	autoheader
-	autoconf
-}
-
-src_install () {
-	exeinto "`xmms-config --visualization-plugin-dir`"
-	doexe libimms.so || die
-	dodoc INSTALL LICENSE README
-}
diff --git a/media-plugins/xmms-imms/xmms-imms-2.0.2.ebuild b/media-plugins/xmms-imms/xmms-imms-2.0.2.ebuild
index ab618c7e1b4f..826c9184b781 100644
--- a/media-plugins/xmms-imms/xmms-imms-2.0.2.ebuild
+++ b/media-plugins/xmms-imms/xmms-imms-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/xmms-imms-2.0.2.ebuild,v 1.2 2005/04/09 17:18:07 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/xmms-imms-2.0.2.ebuild,v 1.3 2005/04/29 15:26:31 luckyduck Exp $
 
 IUSE="bmp xmms"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/imms/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 RDEPEND="=dev-db/sqlite-3*
 	xmms? ( >=media-sound/xmms-1.2.7 )
@@ -23,7 +23,6 @@ RDEPEND="=dev-db/sqlite-3*
 	>=dev-libs/libpcre-4.3
 	=sci-libs/fftw-3*
 	media-sound/sox"
-
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.5
 	>=sys-apps/sed-4.0.7"
diff --git a/media-plugins/xmms-imms/xmms-imms-1.2a.ebuild b/media-plugins/xmms-imms/xmms-imms-2.0.3.ebuild
index c74c7d931e22..ddfd6e9f0c62 100644
--- a/media-plugins/xmms-imms/xmms-imms-1.2a.ebuild
+++ b/media-plugins/xmms-imms/xmms-imms-2.0.3.ebuild
@@ -1,28 +1,27 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/xmms-imms-1.2a.ebuild,v 1.7 2005/01/24 17:20:28 luckyduck Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/xmms-imms-2.0.3.ebuild,v 1.1 2005/04/29 15:26:31 luckyduck Exp $
 
 inherit eutils
 
 MY_P=${P/xmms-/}
-
-DESCRIPTION="intelligent XMMS playlist plug-in that tracks your listening patterns and dynamically adapts to your taste"
+DESCRIPTION="Intelligent playlist plug-in that tracks your listening patterns
+and dynamically adapts to your taste"
 HOMEPAGE="http://www.luminal.org/phpwiki/index.php/IMMS"
 SRC_URI="mirror://sourceforge/imms/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="bmp xmms"
 
 RDEPEND="=dev-db/sqlite-3*
-	media-sound/xmms
+	xmms? ( >=media-sound/xmms-1.2.7 )
+	bmp? ( >=media-sound/beep-media-player-0.9.7 )
 	>=media-libs/taglib-1.1
 	>=dev-libs/libpcre-4.3
 	=sci-libs/fftw-3*
 	media-sound/sox"
-
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.5
 	>=sys-apps/sed-4.0.7"
@@ -30,20 +29,29 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	export WANT_AUTOCONF=2.5
-	autoheader || die
-	autoconf || die
+	unpack ${A} && cd ${S}
+	epatch ${FILESDIR}/${PV}-xorg.patch
 }
 
 src_install () {
-	dobin build/immsremote || die
+	dobin build/immsd || die
 	dobin build/immstool || die
 	dobin build/analyzer || die
-	exeinto "`xmms-config --general-plugin-dir`"
-	doexe build/libimms.so || die
-	dodoc INSTALL LICENSE README
+
+	# install xmms plugin
+	if use xmms
+	then
+		exeinto "$(xmms-config --general-plugin-dir)"
+		doexe build/libxmmsimms*.so || die
+	fi
+
+	# install bmp plugin
+	if use bmp
+	then
+		exeinto "$(beep-config --general-plugin-dir)"
+		doexe build/libbmpimms*.so || die
+	fi
+	dodoc INSTALL README
 }
+
+src_test() { :; }