Drop old version and remove bmp support, always build xmms support now.

(Portage version: 2.1_pre5-r4)

6 files changed, 21 insertions, 108 deletions

diff --git a/media-plugins/xmms-imms/ChangeLog b/media-plugins/xmms-imms/ChangeLog
index 0bc2ea7d2a2d..ef2ed061a4db 100644
--- a/media-plugins/xmms-imms/ChangeLog
+++ b/media-plugins/xmms-imms/ChangeLog
@@ -1,6 +1,11 @@
 # 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.33 2005/09/09 12:30:25 flameeyes Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/ChangeLog,v 1.34 2006/03/06 13:57:03 flameeyes Exp $
+
+  06 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/2.0.2-xorg.patch, -xmms-imms-2.0.2.ebuild, xmms-imms-2.0.3.ebuild,
+  xmms-imms-2.1.1.ebuild:
+  Drop old version and remove bmp support, always build xmms support now.
 
   09 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> xmms-imms-2.0.2.ebuild,
   xmms-imms-2.0.3.ebuild, xmms-imms-2.1.1.ebuild:
diff --git a/media-plugins/xmms-imms/files/2.0.2-xorg.patch b/media-plugins/xmms-imms/files/2.0.2-xorg.patch
deleted file mode 100644
index b2bb2f866613..000000000000
--- a/media-plugins/xmms-imms/files/2.0.2-xorg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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.2 b/media-plugins/xmms-imms/files/digest-xmms-imms-2.0.2
deleted file mode 100644
index c2ff803b0ca3..000000000000
--- a/media-plugins/xmms-imms/files/digest-xmms-imms-2.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 98432004e5c6e6c4a040b592bb0d829a imms-2.0.2.tar.bz2 58830
diff --git a/media-plugins/xmms-imms/xmms-imms-2.0.2.ebuild b/media-plugins/xmms-imms/xmms-imms-2.0.2.ebuild
deleted file mode 100644
index 617513dc3c0d..000000000000
--- a/media-plugins/xmms-imms/xmms-imms-2.0.2.ebuild
+++ /dev/null
@@ -1,58 +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.2.ebuild,v 1.5 2005/09/09 12:30:25 flameeyes 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}-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 README
-}
-
-src_test() { :; }
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 78029e555617..fde007bb6ba1 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
+# Copyright 1999-2006 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.4 2005/09/09 12:30:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/xmms-imms-2.0.3.ebuild,v 1.5 2006/03/06 13:57:03 flameeyes Exp $
 
 inherit eutils
 
@@ -13,11 +13,10 @@ SRC_URI="mirror://sourceforge/imms/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
-IUSE="bmp xmms"
+IUSE=""
 
 RDEPEND="=dev-db/sqlite-3*
-	xmms? ( >=media-sound/xmms-1.2.7 )
-	bmp? ( >=media-sound/beep-media-player-0.9.7 )
+	>=media-sound/xmms-1.2.7
 	>=media-libs/taglib-1.1
 	>=dev-libs/libpcre-4.3
 	=sci-libs/fftw-3*
@@ -38,19 +37,9 @@ src_install () {
 	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
+	exeinto "$(xmms-config --general-plugin-dir)"
+	doexe build/libxmmsimms*.so || die
+
 	dodoc README
 }
 
diff --git a/media-plugins/xmms-imms/xmms-imms-2.1.1.ebuild b/media-plugins/xmms-imms/xmms-imms-2.1.1.ebuild
index 5ac6dfd59e3c..82ed98053cf4 100644
--- a/media-plugins/xmms-imms/xmms-imms-2.1.1.ebuild
+++ b/media-plugins/xmms-imms/xmms-imms-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.3 2005/09/09 12:30:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/xmms-imms-2.1.1.ebuild,v 1.4 2006/03/06 13:57:03 flameeyes Exp $
 
 inherit eutils
 
@@ -13,13 +13,12 @@ SRC_URI="mirror://sourceforge/imms/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="bmp xmms"
+IUSE=""
 
 RESTRICT="primaryuri"
 
 RDEPEND="=dev-db/sqlite-3*
-	xmms? ( >=media-sound/xmms-1.2.7 )
-	bmp? ( >=media-sound/beep-media-player-0.9.7 )
+	>=media-sound/xmms-1.2.7
 	>=media-libs/taglib-1.1
 	>=dev-libs/libpcre-4.3
 	=sci-libs/fftw-3*
@@ -41,19 +40,9 @@ src_install () {
 	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
+	exeinto "$(xmms-config --general-plugin-dir)"
+	doexe build/libxmmsimms*.so || die
+
 	dodoc README
 }