summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2007-10-07 15:36:16 +0000
committerSamuli Suominen <drac@gentoo.org>2007-10-07 15:36:16 +0000
commite746abbd9b9af1d095678c50d8e6d98b5a2b6723 (patch)
tree0300720bd10099e4e6b4319fd7e2865700e9ee15 /app-misc/mplinuxman
parentVersion bump. (diff)
downloadgentoo-2-e746abbd9b9af1d095678c50d8e6d98b5a2b6723.tar.gz
gentoo-2-e746abbd9b9af1d095678c50d8e6d98b5a2b6723.tar.bz2
gentoo-2-e746abbd9b9af1d095678c50d8e6d98b5a2b6723.zip
Revert some of last commit and fix repoman warnings of old ebuild.
(Portage version: 2.1.3.12)
Diffstat (limited to 'app-misc/mplinuxman')
-rw-r--r--app-misc/mplinuxman/mplinuxman-1.4.ebuild9
-rw-r--r--app-misc/mplinuxman/mplinuxman-1.5.ebuild15
2 files changed, 11 insertions, 13 deletions
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;"