Revert some of last commit and fix repoman warnings of old ebuild.

Package-Manager: portage-2.1.3.12

3 files changed, 19 insertions, 21 deletions

diff --git a/app-misc/mplinuxman/Manifest b/app-misc/mplinuxman/Manifest
index c682f4fce266..5b9af789ce7d 100644
--- a/app-misc/mplinuxman/Manifest
+++ b/app-misc/mplinuxman/Manifest
@@ -4,14 +4,14 @@ RMD160 80b874e980a33ff5d7c54dcc2f6dc64f17541a26 files/mplinuxman-1.5-stringh.pat
 SHA256 b3974a6f4a6af0230ff5c710048c4393012195b9915eddea5d87d8f22c471c07 files/mplinuxman-1.5-stringh.patch 1669
 DIST mplinuxman-source-1.4.tar.gz 95342 RMD160 b882946c12737d48abdedb1008b60486f2e18bd2 SHA1 752ac5799aab726a02977a8603c6d94f389b4a8a SHA256 204bf89e2287f950746194f77fdcf72ff78a346a52ec967b8e500e07df2d0da1
 DIST mplinuxman-source-1.5.tar.gz 95331 RMD160 5eb03482810b8b91571d75d07638afde7ae95fe3 SHA1 ea31985978846f2549eb974d37088cf5ad8ed72b SHA256 3c1a5a506feca4cb12f39886361421859642bdbc8c9b4eaf40a321bd8a6e5086
-EBUILD mplinuxman-1.4.ebuild 1286 RMD160 2832acd9253e09591caffa81368705324cdf3ccb SHA1 ab378d10cabd8bbb76981e8b01ad8a21ae4a1969 SHA256 87407ff911f6332bb2fb6c0eb82865e7774801f9d009f242e9be77c5d54cc9bf
-MD5 505cb8e1616511fd4981b2c87eaf0faa mplinuxman-1.4.ebuild 1286
-RMD160 2832acd9253e09591caffa81368705324cdf3ccb mplinuxman-1.4.ebuild 1286
-SHA256 87407ff911f6332bb2fb6c0eb82865e7774801f9d009f242e9be77c5d54cc9bf mplinuxman-1.4.ebuild 1286
-EBUILD mplinuxman-1.5.ebuild 1437 RMD160 38fd3813c2f11e11f2989bdc465136456ae97b81 SHA1 efbe40c0c398ca30682e38da9307fbe9a81e391f SHA256 33cf8434ceeb540139ccb52fdcb93abe4561b4514628804de54b682c1862ce7f
-MD5 105b0c67be979e1ff59b6c05e2266fae mplinuxman-1.5.ebuild 1437
-RMD160 38fd3813c2f11e11f2989bdc465136456ae97b81 mplinuxman-1.5.ebuild 1437
-SHA256 33cf8434ceeb540139ccb52fdcb93abe4561b4514628804de54b682c1862ce7f mplinuxman-1.5.ebuild 1437
+EBUILD mplinuxman-1.4.ebuild 1260 RMD160 1212f3981668e562ec148575ba556617d8406898 SHA1 269702a4fb56a60e3cc83090ea598d8231b2df7d SHA256 73531aead61412d2aaeb6b5fe75cf4fe694cb0b77822841a71893026482ab7a3
+MD5 9256fd6463b011a0b18f4b198d275f5d mplinuxman-1.4.ebuild 1260
+RMD160 1212f3981668e562ec148575ba556617d8406898 mplinuxman-1.4.ebuild 1260
+SHA256 73531aead61412d2aaeb6b5fe75cf4fe694cb0b77822841a71893026482ab7a3 mplinuxman-1.4.ebuild 1260
+EBUILD mplinuxman-1.5.ebuild 1353 RMD160 2282f0962191264a603562c7ab74c26233d1f22e SHA1 1b7fdfecffd583df159e58e132420766f0dee5ed SHA256 6c4264212719d1a7d96a2424f8687a69b7435a25e119317c3beb45cd93f2cb69
+MD5 c9c0a4aca179c50578427f3d7155aa3e mplinuxman-1.5.ebuild 1353
+RMD160 2282f0962191264a603562c7ab74c26233d1f22e mplinuxman-1.5.ebuild 1353
+SHA256 6c4264212719d1a7d96a2424f8687a69b7435a25e119317c3beb45cd93f2cb69 mplinuxman-1.5.ebuild 1353
 MISC ChangeLog 1468 RMD160 d8953d3b182e468d8060c66481b20aef192f212c SHA1 7cfbf9ccb54277cbb9bec69ea0ac84618c3f0387 SHA256 417ffe0735a4b042da6737c9148378c4473f120a76816ffb1c2e55dfeca38213
 MD5 117916c0220c3e7f711be0fa3255cf16 ChangeLog 1468
 RMD160 d8953d3b182e468d8060c66481b20aef192f212c ChangeLog 1468
diff --git a/app-misc/mplinuxman/mplinuxman-1.4.ebuild b/app-misc/mplinuxman/mplinuxman-1.4.ebuild
index 32347d8f5af2..fdb840618de9 100644
--- a/app-misc/mplinuxman/mplinuxman-1.4.ebuild
+++ b/app-misc/mplinuxman/mplinuxman-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.10 2006/10/14 09:07:49 flameeyes Exp $
+# $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/"
@@ -16,10 +16,11 @@ RDEPEND=">=x11-libs/gtk+-2.2.4-r1
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}"/${PN}
 
 src_unpack() {
-	unpack ${A} && cd ${S} || die "unpack failed"
+	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
diff --git a/app-misc/mplinuxman/mplinuxman-1.5.ebuild b/app-misc/mplinuxman/mplinuxman-1.5.ebuild
index da2e5916cd1d..bc251518a52d 100644
--- a/app-misc/mplinuxman/mplinuxman-1.5.ebuild
+++ b/app-misc/mplinuxman/mplinuxman-1.5.ebuild
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.1 2007/10/07 15:15:42 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mplinuxman/mplinuxman-1.5.ebuild,v 1.2 2007/10/07 15:36:16 drac Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,13 +11,13 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
+IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2
 	|| ( media-sound/mpg123 media-sound/mpg321 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
+	sys-devel/gettext"
 
 S="${WORKDIR}"/${PN}
 
@@ -32,8 +32,6 @@ src_unpack() {
 	sed -e "s:CFLAGS = :CFLAGS = ${CFLAGS} :" \
 		-e 's:/usr/local/share/locale:$(DESTDIR)/usr/share/locale:' \
 		-i makefile
-
-	use nls || sed -i -e 's:-D NLS="1"::' makefile
 }
 
 src_compile() {
@@ -45,10 +43,9 @@ src_compile() {
 src_install() {
 	dobin ${PN} extra/mp_util/{mputil,mputil_smart}
 
-	if use nls; then
-		dodir /usr/share/locale/{de,es,fr,ja,nl}/LC_MESSAGES
-		DESTDIR="${D}" emake install-po
-	fi
+	dodir /usr/share/locale/{de,es,fr,ja,nl}/LC_MESSAGES
+
+	DESTDIR="${D}" emake install-po
 
 	newicon logo.xpm ${PN}.xpm
 	make_desktop_entry ${PN} ${PN} ${PN} "AudioVideo;Audio;GTK;"