5 files changed, 135 insertions, 5 deletions
diff --git a/app-misc/mplinuxman/ChangeLog b/app-misc/mplinuxman/ChangeLog
index 8d9f1c3a7eac..c994a3910223 100644
--- a/app-misc/mplinuxman/ChangeLog
+++ b/app-misc/mplinuxman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/mplinuxman
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mplinuxman/ChangeLog,v 1.10 2007/02/21 22:36:09 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mplinuxman/ChangeLog,v 1.11 2007/10/07 15:15:42 drac Exp $
+
+*mplinuxman-1.5 (07 Oct 2007)
+
+  07 Oct 2007; Samuli Suominen <drac@gentoo.org>
+  +files/mplinuxman-1.5-stringh.patch, +mplinuxman-1.5.ebuild:
+  Version bump for bug 190723, thanks to Arfrever Frehtes Taifersar Arahesis
+  for reporting.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-misc/mplinuxman/Manifest b/app-misc/mplinuxman/Manifest
index e20a08034ef0..c682f4fce266 100644
--- a/app-misc/mplinuxman/Manifest
+++ b/app-misc/mplinuxman/Manifest
@@ -1,12 +1,21 @@
+AUX mplinuxman-1.5-stringh.patch 1669 RMD160 80b874e980a33ff5d7c54dcc2f6dc64f17541a26 SHA1 b935ef70c56acd7ebb7670e727de6abf3ae8eda9 SHA256 b3974a6f4a6af0230ff5c710048c4393012195b9915eddea5d87d8f22c471c07
+MD5 351853561d9c7c1287631a214c215f68 files/mplinuxman-1.5-stringh.patch 1669
+RMD160 80b874e980a33ff5d7c54dcc2f6dc64f17541a26 files/mplinuxman-1.5-stringh.patch 1669
+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
-MISC ChangeLog 1231 RMD160 884eee27ab6e83cb9507f476c5066f65d4ba3c79 SHA1 091d455a0e177c8d82da5a7b0191bd47a2fe7b9a SHA256 95e0c5804dd6f39c8defc83e3c94c4bd05ba0f2299cc92d4b8e6d99b72df7642
-MD5 dd08ae83391fe012a3043ed63e6c93ea ChangeLog 1231
-RMD160 884eee27ab6e83cb9507f476c5066f65d4ba3c79 ChangeLog 1231
-SHA256 95e0c5804dd6f39c8defc83e3c94c4bd05ba0f2299cc92d4b8e6d99b72df7642 ChangeLog 1231
+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
+MISC ChangeLog 1468 RMD160 d8953d3b182e468d8060c66481b20aef192f212c SHA1 7cfbf9ccb54277cbb9bec69ea0ac84618c3f0387 SHA256 417ffe0735a4b042da6737c9148378c4473f120a76816ffb1c2e55dfeca38213
+MD5 117916c0220c3e7f711be0fa3255cf16 ChangeLog 1468
+RMD160 d8953d3b182e468d8060c66481b20aef192f212c ChangeLog 1468
+SHA256 417ffe0735a4b042da6737c9148378c4473f120a76816ffb1c2e55dfeca38213 ChangeLog 1468
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -14,3 +23,6 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 f247b26b36ae2dd72d90c114bfd2cdc0 files/digest-mplinuxman-1.4 262
 RMD160 fab48eb9ca27a182a2247cd1e3a6986e0dc2a334 files/digest-mplinuxman-1.4 262
 SHA256 f3e510475cf069678492ca7f66e6c17172a8d5e02c0bb94a7c60c7c28ce5caf7 files/digest-mplinuxman-1.4 262
+MD5 f1a8d9acc4dff9a2e7b4c6c48a43cb12 files/digest-mplinuxman-1.5 262
+RMD160 7c04cf35a077f05c8c390e9694c8ff586a30cf4c files/digest-mplinuxman-1.5 262
+SHA256 fd17944ccbfc9ea8870e0a68b4eb4f52527e898710fdc8b24154aacfe53ce793 files/digest-mplinuxman-1.5 262
diff --git a/app-misc/mplinuxman/files/digest-mplinuxman-1.5 b/app-misc/mplinuxman/files/digest-mplinuxman-1.5
new file mode 100644
index 000000000000..dc8c237dfb4e
--- /dev/null
+++ b/app-misc/mplinuxman/files/digest-mplinuxman-1.5
@@ -0,0 +1,3 @@
+MD5 5fc77bdf6741733f359f029e8f7ca838 mplinuxman-source-1.5.tar.gz 95331
+RMD160 5eb03482810b8b91571d75d07638afde7ae95fe3 mplinuxman-source-1.5.tar.gz 95331
+SHA256 3c1a5a506feca4cb12f39886361421859642bdbc8c9b4eaf40a321bd8a6e5086 mplinuxman-source-1.5.tar.gz 95331
diff --git a/app-misc/mplinuxman/files/mplinuxman-1.5-stringh.patch b/app-misc/mplinuxman/files/mplinuxman-1.5-stringh.patch
new file mode 100644
index 000000000000..51e9946dee86
--- /dev/null
+++ b/app-misc/mplinuxman/files/mplinuxman-1.5-stringh.patch
@@ -0,0 +1,51 @@
+diff -ur mplinuxman.orig/extra/mp_util/mputil.c mplinuxman/extra/mp_util/mputil.c
+--- mplinuxman.orig/extra/mp_util/mputil.c	2003-05-22 00:34:41.000000000 +0300
++++ mplinuxman/extra/mp_util/mputil.c	2007-10-07 18:07:33.000000000 +0300
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <usb.h>
++#include <string.h>
+ #include "f60lib.h"
+ #include "mp3util.h"
+ 
+diff -ur mplinuxman.orig/ini/ini.c mplinuxman/ini/ini.c
+--- mplinuxman.orig/ini/ini.c	2006-01-21 00:03:34.000000000 +0200
++++ mplinuxman/ini/ini.c	2007-10-07 18:06:28.000000000 +0300
+@@ -1,4 +1,4 @@
+-
++#include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include "ini.h"
+diff -ur mplinuxman.orig/libusb/descriptors.c mplinuxman/libusb/descriptors.c
+--- mplinuxman.orig/libusb/descriptors.c	2003-05-22 00:34:45.000000000 +0300
++++ mplinuxman/libusb/descriptors.c	2007-10-07 18:07:03.000000000 +0300
+@@ -7,6 +7,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include "usbi.h"
+ 
+ int usb_get_descriptor(usb_dev_handle *udev, unsigned char type, unsigned char index, void *buf, int size)
+diff -ur mplinuxman.orig/main.c mplinuxman/main.c
+--- mplinuxman.orig/main.c	2003-11-25 14:45:01.000000000 +0200
++++ mplinuxman/main.c	2007-10-07 18:05:35.000000000 +0300
+@@ -4,6 +4,7 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <gtk/gtk.h>
++#include <string.h>
+ #include "mplinux.h"
+ #include "useful.h"
+ 
+diff -ur mplinuxman.orig/mp3util.c mplinuxman/mp3util.c
+--- mplinuxman.orig/mp3util.c	2004-01-20 09:38:26.000000000 +0200
++++ mplinuxman/mp3util.c	2007-10-07 18:06:07.000000000 +0300
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <sys/stat.h>
++#include <string.h>
+ #include "mp3util.h"
+ 
+ /*
diff --git a/app-misc/mplinuxman/mplinuxman-1.5.ebuild b/app-misc/mplinuxman/mplinuxman-1.5.ebuild
new file mode 100644
index 000000000000..da2e5916cd1d
--- /dev/null
+++ b/app-misc/mplinuxman/mplinuxman-1.5.ebuild
@@ -0,0 +1,57 @@
+# 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 $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Manager for MPMan F60/55/50 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
+	|| ( media-sound/mpg123 media-sound/mpg321 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}"/${PN}
+
+# This is ugly and someone should write upstream a patch,
+# but it's not me. - drac
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-stringh.patch
+
+	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() {
+	emake CC="$(tc-getCC)" || die "emake failed."
+	cd extra/mp_util
+	emake CC="$(tc-getCC)" || die "emake failed."
+}
+
+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
+
+	newicon logo.xpm ${PN}.xpm
+	make_desktop_entry ${PN} ${PN} ${PN} "AudioVideo;Audio;GTK;"
+
+	dodoc CHANGES README extra/mp_util/USAGE.txt
+}