x86 stable, bug #204360 and remove old

(Portage version: 2.1.4_rc14)

4 files changed, 7 insertions, 52 deletions

diff --git a/app-misc/mplinuxman/ChangeLog b/app-misc/mplinuxman/ChangeLog
index 11355aae0e0b..07f59e0ec59b 100644
--- a/app-misc/mplinuxman/ChangeLog
+++ b/app-misc/mplinuxman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/mplinuxman
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mplinuxman/ChangeLog,v 1.12 2008/01/05 14:33:57 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mplinuxman/ChangeLog,v 1.13 2008/01/05 21:15:51 maekke Exp $
+
+  05 Jan 2008; Markus Meier <maekke@gentoo.org> -mplinuxman-1.4.ebuild,
+  mplinuxman-1.5.ebuild:
+  x86 stable, bug #204360 and remove old
 
   05 Jan 2008; Samuli Suominen <drac@gentoo.org> mplinuxman-1.5.ebuild:
   amd64 stable wrt #204360
diff --git a/app-misc/mplinuxman/files/digest-mplinuxman-1.4 b/app-misc/mplinuxman/files/digest-mplinuxman-1.4
deleted file mode 100644
index 5d37fdf2e517..000000000000
--- a/app-misc/mplinuxman/files/digest-mplinuxman-1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c830925640e3df96f5fa4a7f53b04e15 mplinuxman-source-1.4.tar.gz 95342
-RMD160 b882946c12737d48abdedb1008b60486f2e18bd2 mplinuxman-source-1.4.tar.gz 95342
-SHA256 204bf89e2287f950746194f77fdcf72ff78a346a52ec967b8e500e07df2d0da1 mplinuxman-source-1.4.tar.gz 95342
diff --git a/app-misc/mplinuxman/mplinuxman-1.4.ebuild b/app-misc/mplinuxman/mplinuxman-1.4.ebuild
deleted file mode 100644
index fdb840618de9..000000000000
--- a/app-misc/mplinuxman/mplinuxman-1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mplinuxman/mplinuxman-1.4.ebuild,v 1.11 2007/10/07 15:36:16 drac Exp $
-
-DESCRIPTION="A gtk2 frontend and drivers for mpman f50/55/60 mp3 players"
-HOMEPAGE="http://mplinuxman.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="nls"
-
-RDEPEND=">=x11-libs/gtk+-2.2.4-r1
-	nls? ( >=sys-devel/gettext-0.12.1 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}"/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s,^CFLAGS = ,CFLAGS = ${CFLAGS} ," makefile
-	sed -i -e "s,export LOCALE_DIR=/usr/local/share/locale,export LOCALE_DIR=${D}/usr/share/locale," makefile
-	if ! use nls ; then
-		sed -i -e "s,-D NLS=1,," makefile
-	fi
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin mplinuxman || die "dobin failed"
-	if use nls ; then
-		dodir /usr/share/locale/es/LC_MESSAGES
-		dodir /usr/share/locale/fr/LC_MESSAGES
-		dodir /usr/share/locale/ja/LC_MESSAGES
-		dodir /usr/share/locale/nl/LC_MESSAGES
-		dodir /usr/share/locale/de/LC_MESSAGES
-		DESTDIR="${D}" make install-po
-	fi
-	dodoc CHANGES README
-}
diff --git a/app-misc/mplinuxman/mplinuxman-1.5.ebuild b/app-misc/mplinuxman/mplinuxman-1.5.ebuild
index e835481ff7e1..8082303a2c2e 100644
--- a/app-misc/mplinuxman/mplinuxman-1.5.ebuild
+++ b/app-misc/mplinuxman/mplinuxman-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mplinuxman/mplinuxman-1.5.ebuild,v 1.3 2008/01/05 14:33:57 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mplinuxman/mplinuxman-1.5.ebuild,v 1.4 2008/01/05 21:15:51 maekke Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2