removed old version. added patch to fix #79825

Package-Manager: portage-2.0.51.19

7 files changed, 39 insertions, 92 deletions

diff --git a/media-plugins/xmms-imms/ChangeLog b/media-plugins/xmms-imms/ChangeLog
index 7e10b6a22cb1..59f472bdde6f 100644
--- a/media-plugins/xmms-imms/ChangeLog
+++ b/media-plugins/xmms-imms/ChangeLog
@@ -1,6 +1,10 @@
 # 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.25 2005/01/28 14:10:01 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/ChangeLog,v 1.26 2005/04/09 17:18:07 luckyduck Exp $
+
+  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:
+  removed old version. added patch to fix #79825
 
 *xmms-imms-2.0.2 (28 Jan 2005)
 
diff --git a/media-plugins/xmms-imms/Manifest b/media-plugins/xmms-imms/Manifest
index d2665037a0a1..096188c84467 100644
--- a/media-plugins/xmms-imms/Manifest
+++ b/media-plugins/xmms-imms/Manifest
@@ -1,17 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 30319e7914cd8f2f17305f2d9d8d80d2 xmms-imms-1.0.1.ebuild 1114
-MD5 17cea4c8c68f2d0df40bdce41ef2debe xmms-imms-2.0.1.ebuild 1337
 MD5 189f644e82685832cad77c697ced6fa7 xmms-imms-1.2a.ebuild 1108
 MD5 6e84d8a021671c144b0860c8c39750d0 xmms-imms-1.1.ebuild 1117
-MD5 6459bec30d7c67a04225868c6a683ebc xmms-imms-2.0.2.ebuild 1257
-MD5 63cd244c9b22c29b8fa86bc54557b6e1 ChangeLog 3680
+MD5 c8a696821310513321a062c48a1fe5d9 xmms-imms-2.0.2.ebuild 1346
+MD5 122e3f097ae504b1261ff82aa3342476 ChangeLog 3885
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 94ff3f9aff50a805fa9bfc3ca3a74658 files/xmms-imms-1.1-makefile.patch 2517
-MD5 55f5bc41642e8db8f4234656169460da files/2.0.1-gentoo.patch 710
 MD5 5b150539965e8d54fbd01a73a683bff0 files/digest-xmms-imms-1.1 60
 MD5 de370ccf262cc471d299d6e6b6c90ea3 files/digest-xmms-imms-1.0.1 62
-MD5 1a478311a799b95a935052cff2556531 files/digest-xmms-imms-2.0.1 62
 MD5 3d1f3a0eb7144d8230e55f5968e0cd96 files/digest-xmms-imms-2.0.2 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 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.1-gentoo.patch b/media-plugins/xmms-imms/files/2.0.1-gentoo.patch
deleted file mode 100644
index a076769e1052..000000000000
--- a/media-plugins/xmms-imms/files/2.0.1-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urpN immscore.orig/giosocket.h immscore/giosocket.h
---- immscore.orig/giosocket.h	2005-01-24 17:27:20.962630728 +0100
-+++ immscore/giosocket.h	2005-01-24 17:33:14.624865896 +0100
-@@ -89,7 +89,7 @@ public:
-             return (write_tag = 0);
- 
-         unsigned len = strlen(outp);
--        unsigned n = 0;
-+        gsize n = 0;
-         GIOError e = g_io_channel_write(con, (char*)outp, len, &n);
-         if (e == G_IO_ERROR_NONE)
-         {
-@@ -122,7 +122,7 @@ public:
- 
-         if (condition & G_IO_IN)
-         {
--            unsigned n = 0;
-+            gsize n = 0;
-             GIOError e = g_io_channel_read(con, buf, sizeof(buf) - 1, &n);
-             if (e == G_IO_ERROR_NONE)
-             {
diff --git a/media-plugins/xmms-imms/files/2.0.2-xorg.patch b/media-plugins/xmms-imms/files/2.0.2-xorg.patch
new file mode 100644
index 000000000000..b2bb2f866613
--- /dev/null
+++ b/media-plugins/xmms-imms/files/2.0.2-xorg.patch
@@ -0,0 +1,11 @@
+diff -urpN imms-2.0.2.orig/vars.mk.in imms-2.0.2/vars.mk.in
+--- imms-2.0.2.orig/vars.mk.in	2005-04-09 18:54:46.000000000 +0200
++++ imms-2.0.2/vars.mk.in	2005-04-09 19:01:44.000000000 +0200
+@@ -23,6 +23,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-2.0.1 b/media-plugins/xmms-imms/files/digest-xmms-imms-2.0.1
deleted file mode 100644
index 10dc277273f8..000000000000
--- a/media-plugins/xmms-imms/files/digest-xmms-imms-2.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e48110d330de310d30ffadee9f5fc1ab imms-2.0.1.tar.bz2 58658
diff --git a/media-plugins/xmms-imms/xmms-imms-2.0.1.ebuild b/media-plugins/xmms-imms/xmms-imms-2.0.1.ebuild
deleted file mode 100644
index 8f4b26a69807..000000000000
--- a/media-plugins/xmms-imms/xmms-imms-2.0.1.ebuild
+++ /dev/null
@@ -1,60 +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-2.0.1.ebuild,v 1.2 2005/01/25 15:12:23 luckyduck Exp $
-
-IUSE="bmp xmms"
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-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}-gentoo.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 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 58d104c61d84..ab618c7e1b4f 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.1 2005/01/28 14:10:01 luckyduck Exp $
+# $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 $
 
 IUSE="bmp xmms"
 
@@ -8,7 +8,7 @@ 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 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"
 
@@ -30,6 +30,11 @@ DEPEND="${RDEPEND}
 
 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
@@ -48,6 +53,7 @@ src_install () {
 		exeinto "`beep-config --general-plugin-dir`"
 		doexe build/libbmpimms*.so || die
 	fi
-
-	dodoc INSTALL LICENSE README
+	dodoc INSTALL README
 }
+
+src_test() { :; }