new upstream version, improved patch to enable compilation again.

(Portage version: 2.0.51.22-r1)

10 files changed, 116 insertions, 153 deletions

diff --git a/media-plugins/xmms-imms/ChangeLog b/media-plugins/xmms-imms/ChangeLog
index e755913ef7f5..791227bfcc6b 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.28 2005/05/07 19:13:25 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/ChangeLog,v 1.29 2005/05/21 21:31:00 luckyduck Exp $
+
+*xmms-imms-2.1.1 (21 May 2005)
+
+  21 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/xmms-imms-1.1-gcc34.patch, +files/2.1.1-xorg.patch,
+  -files/xmms-imms-1.1-makefile.patch, -xmms-imms-1.1.ebuild,
+  xmms-imms-2.0.3.ebuild, +xmms-imms-2.1.1.ebuild:
+  new upstream version, improved patch to enable compilation. mailed it
+  upstream again.
 
   07 May 2005; Jason Wever <weeve@gentoo.org> xmms-imms-2.0.2.ebuild:
   Marked stable on SPARC wrt bug #90863.
diff --git a/media-plugins/xmms-imms/Manifest b/media-plugins/xmms-imms/Manifest
index eb73a23afa81..6f44d7d1e0e5 100644
--- a/media-plugins/xmms-imms/Manifest
+++ b/media-plugins/xmms-imms/Manifest
@@ -1,12 +1,11 @@
-MD5 ee3be427a959c5fa96487efe2c8ed142 ChangeLog 4378
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 6e84d8a021671c144b0860c8c39750d0 xmms-imms-1.1.ebuild 1117
-MD5 67717ff4d50914e84898a30eda10c905 xmms-imms-2.0.3.ebuild 1340
+MD5 41a63a963a6431ddbdfa573f82114d54 xmms-imms-2.0.3.ebuild 1338
+MD5 b1c65762914ec62b7885eb5338a7c8b9 xmms-imms-2.1.1.ebuild 1363
 MD5 4a3f07f3a22b1b15358f8decc1e4c75e xmms-imms-2.0.2.ebuild 1338
-MD5 5b150539965e8d54fbd01a73a683bff0 files/digest-xmms-imms-1.1 60
+MD5 c559729b3e65b537a9e56262ff5e345c ChangeLog 4727
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 bcde683a9a9163bd75cb3db3d763d735 files/2.1.1-xorg.patch 988
+MD5 3d1f3a0eb7144d8230e55f5968e0cd96 files/digest-xmms-imms-2.0.2 62
 MD5 5c71298a389ce9bcee576b62ef169c59 files/digest-xmms-imms-2.0.3 62
-MD5 94ff3f9aff50a805fa9bfc3ca3a74658 files/xmms-imms-1.1-makefile.patch 2517
-MD5 adf2b4594ebdf6ecbb6fcccfb126db85 files/xmms-imms-1.1-gcc34.patch 590
+MD5 b0477768a83c635b2cc2cc6a48bcc17c files/digest-xmms-imms-2.1.1 62
 MD5 49ca58eddd51ca3315cbb1c12a4ceff6 files/2.0.2-xorg.patch 383
 MD5 e5403b0fc1232e7de884fe7af6d709e0 files/2.0.3-xorg.patch 271
-MD5 3d1f3a0eb7144d8230e55f5968e0cd96 files/digest-xmms-imms-2.0.2 62
diff --git a/media-plugins/xmms-imms/files/2.1.1-xorg.patch b/media-plugins/xmms-imms/files/2.1.1-xorg.patch
new file mode 100644
index 000000000000..b4a6a69b37a1
--- /dev/null
+++ b/media-plugins/xmms-imms/files/2.1.1-xorg.patch
@@ -0,0 +1,37 @@
+diff -uprN imms-2.1.1.orig/immscore/xidle.h imms-2.1.1/immscore/xidle.h
+--- imms-2.1.1.orig/immscore/xidle.h	2005-05-21 23:00:33.000000000 +0200
++++ imms-2.1.1/immscore/xidle.h	2005-05-21 23:10:44.000000000 +0200
+@@ -4,9 +4,7 @@
+ #include "immsconf.h"
+ 
+ #include <time.h>
+-#ifdef WITH_XSCREENSAVER
+-# include <X11/Xlib.h>
+-#endif
++#include <X11/Xlib.h>
+ 
+ class XIdle
+ {
+@@ -27,11 +25,9 @@ private:
+     int active;
+     time_t last_checked;
+ 
+-#ifdef WITH_XSCREENSAVER
+     Display *display;
+     Screen *screen;
+     Window root;
+-#endif
+ 
+     unsigned int prev_mask;
+     int prev_rootX, prev_rootY;
+diff -uprN imms-2.1.1.orig/vars.mk.in imms-2.1.1/vars.mk.in
+--- imms-2.1.1.orig/vars.mk.in	2005-05-21 23:00:33.000000000 +0200
++++ imms-2.1.1/vars.mk.in	2005-05-21 23:00:55.000000000 +0200
+@@ -24,6 +24,6 @@ CXXFLAGS=@CXXFLAGS@ -fno-rtti
+ 
+ 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.1 b/media-plugins/xmms-imms/files/digest-xmms-imms-1.1
deleted file mode 100644
index 96b56c47a531..000000000000
--- a/media-plugins/xmms-imms/files/digest-xmms-imms-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b229b76f183ff2b3d4d1eccfd0569da2 imms-1.1.tar.bz2 48912
diff --git a/media-plugins/xmms-imms/files/digest-xmms-imms-2.1.1 b/media-plugins/xmms-imms/files/digest-xmms-imms-2.1.1
new file mode 100644
index 000000000000..331fe67337d8
--- /dev/null
+++ b/media-plugins/xmms-imms/files/digest-xmms-imms-2.1.1
@@ -0,0 +1 @@
+MD5 e5423b073974daafd051cecf1b6d9472 imms-2.1.1.tar.bz2 59103
diff --git a/media-plugins/xmms-imms/files/xmms-imms-1.1-gcc34.patch b/media-plugins/xmms-imms/files/xmms-imms-1.1-gcc34.patch
deleted file mode 100644
index cae155ce295d..000000000000
--- a/media-plugins/xmms-imms/files/xmms-imms-1.1-gcc34.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur imms-1.1.orig/correlate.cc imms-1.1/correlate.cc
---- imms-1.1.orig/correlate.cc	2004-04-15 13:15:24.000000000 -0700
-+++ imms-1.1/correlate.cc	2004-06-28 01:37:36.861833790 -0700
-@@ -1,3 +1,4 @@
-+#include <math.h>
- #include <assert.h>
- #include <iostream>
- 
-diff -Naur imms-1.1.orig/immstool.cc imms-1.1/immstool.cc
---- imms-1.1.orig/immstool.cc	2004-04-15 13:15:24.000000000 -0700
-+++ imms-1.1/immstool.cc	2004-06-28 01:38:00.840936918 -0700
-@@ -4,6 +4,7 @@
- #include <list>
- #include <utility>
- 
-+#include <math.h>
- #include <assert.h>
- #include <stdlib.h>
- #include <unistd.h>
diff --git a/media-plugins/xmms-imms/files/xmms-imms-1.1-makefile.patch b/media-plugins/xmms-imms/files/xmms-imms-1.1-makefile.patch
deleted file mode 100644
index 8c53c392cd96..000000000000
--- a/media-plugins/xmms-imms/files/xmms-imms-1.1-makefile.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -Naur imms-1.1.orig/rules.mk imms-1.1/rules.mk
---- imms-1.1.orig/rules.mk	2004-04-15 13:15:24.000000000 -0700
-+++ imms-1.1/rules.mk	2004-04-19 23:52:20.000000000 -0700
-@@ -14,12 +14,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) $(CPPFLAGS) -M -E $< > .$*.d
--	$(CC) $(CPPFLAGS) -c $< -o $@
-+	@$(CC) $(CPPFLAGS) $(CFLAGS) -M -E $< > .$*.d
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
- 
- .PHONY: clean distclean
- 
-@@ -48,26 +48,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_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/
-+install: all
-+	mkdir -p $(DESTDIR)`xmms-config --visualization-plugin-dir`
-+	$(INSTALL_PROGRAM) libimms.so $(DESTDIR)`xmms-config --visualization-plugin-dir`
-diff -Naur imms-1.1.orig/vars.mk.in imms-1.1/vars.mk.in
---- imms-1.1.orig/vars.mk.in	2004-04-15 13:15:24.000000000 -0700
-+++ imms-1.1/vars.mk.in	2004-04-19 23:54:58.000000000 -0700
-@@ -2,7 +2,6 @@
- CXX = @CXX@
- VERSION = @PACKAGE_VERSION@
- INSTALL_PROGRAM = @INSTALL@
--DESTDIR = @prefix@
- 
- SHELL = bash
- XMMS_OBJ = @PLUGIN_OBJ@ interface.o player.o libimmscore.a 
-@@ -10,8 +9,9 @@
- 	   fetcher.o picker.o spectrum.o songinfo.o comm.o server.o \
- 	   regexx.o utils.o strmanip.o levenshtein.o xidle.o md5.o
- 
--CPPFLAGS = `xmms-config --cflags` @XCPPFLAGS@ -Wall -fPIC -D_REENTRANT
--CXXFLAGS = ${CPPFLAGS} -fno-rtti
-+CPPFLAGS = `xmms-config --cflags` @XCPPFLAGS@ @CPPFLAGS@ -D_REENTRANT
-+CFLAGS = -fPIC @CFLAGS@ 
-+CXXFLAGS = -fPIC -fno-rtti @CXXFLAGS@
- LDFLAGS = `xmms-config --libs` @LIBS@
- ARFLAGS = rs
- 
diff --git a/media-plugins/xmms-imms/xmms-imms-1.1.ebuild b/media-plugins/xmms-imms/xmms-imms-1.1.ebuild
deleted file mode 100644
index fb48a42e130f..000000000000
--- a/media-plugins/xmms-imms/xmms-imms-1.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.1.ebuild,v 1.8 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 sparc"
-
-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.3.ebuild b/media-plugins/xmms-imms/xmms-imms-2.0.3.ebuild
index ddfd6e9f0c62..b766681a0745 100644
--- a/media-plugins/xmms-imms/xmms-imms-2.0.3.ebuild
+++ b/media-plugins/xmms-imms/xmms-imms-2.0.3.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.3.ebuild,v 1.1 2005/04/29 15:26:31 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/xmms-imms-2.0.3.ebuild,v 1.2 2005/05/21 21:31:00 luckyduck Exp $
 
 inherit eutils
 
@@ -12,7 +12,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"
 IUSE="bmp xmms"
 
 RDEPEND="=dev-db/sqlite-3*
diff --git a/media-plugins/xmms-imms/xmms-imms-2.1.1.ebuild b/media-plugins/xmms-imms/xmms-imms-2.1.1.ebuild
new file mode 100644
index 000000000000..cf8cd16e67a9
--- /dev/null
+++ b/media-plugins/xmms-imms/xmms-imms-2.1.1.ebuild
@@ -0,0 +1,59 @@
+# 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.1.1.ebuild,v 1.1 2005/05/21 21:31:00 luckyduck Exp $
+
+inherit eutils
+
+MY_P=${P/xmms-/}
+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"
+
+RESTRICT="primaryuri"
+
+RDEPEND="=dev-db/sqlite-3*
+	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"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A} && cd ${S}
+	epatch ${FILESDIR}/${PV}-xorg.patch
+}
+
+src_install () {
+	dobin build/immsd || die
+	dobin build/immstool || die
+	dobin build/analyzer || die
+
+	# 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() { :; }