bump to 1.3.0, remove 1.1.0

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 30 insertions, 26 deletions

diff --git a/media-sound/gmtp/ChangeLog b/media-sound/gmtp/ChangeLog
index 9aafd8cc5550..c4aef1a33fa3 100644
--- a/media-sound/gmtp/ChangeLog
+++ b/media-sound/gmtp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/gmtp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmtp/ChangeLog,v 1.4 2011/11/12 11:30:18 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmtp/ChangeLog,v 1.5 2011/12/24 10:32:11 tomka Exp $
+
+*gmtp-1.3.0 (24 Dec 2011)
+
+  24 Dec 2011; Thomas Kahle <tomka@gentoo.org> -gmtp-1.1.0.ebuild,
+  +gmtp-1.3.0.ebuild, +files/gmtp-1.3.0-makefile-gentoo.patch,
+  -files/makefile-gentoo.patch:
+  bump to 1.3.0, remove 1.1.0
 
   12 Nov 2011; Thomas Kahle <tomka@gentoo.org> gmtp-1.1.0.ebuild,
   gmtp-1.2.0.ebuild:
diff --git a/media-sound/gmtp/Manifest b/media-sound/gmtp/Manifest
index 76f7f3428322..123042461607 100644
--- a/media-sound/gmtp/Manifest
+++ b/media-sound/gmtp/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 AUX gmtp-1.2.0-makefile-gentoo.patch 3126 RMD160 911d20aec8e5e0b9b54bde8f3b57f91af1687aba SHA1 a27bc20ef96faccb0b564870d9387b627efd972a SHA256 f8163f52b68997ca3cecd7eff6c85f64000f98cb1c007fb027711b2a8006253d
-AUX makefile-gentoo.patch 3126 RMD160 31b2cdecb5c4d4ab97da153fd83e857ec5cfbfb2 SHA1 434ab0edc5a4e399b1ed8a4cc0b925256833abc6 SHA256 b76cd6be0af482f9ef7f33f6b1b6ce1e43b48896b549eaafab41c088fef56138
+AUX gmtp-1.3.0-makefile-gentoo.patch 3123 RMD160 870fa4475028af343ea0438601e17444d427e18b SHA1 59c5ad9d7b511b61d5f0b375e7956d3add597ce8 SHA256 01677507e7d4aeb4af28947e2bb0e10f2400204313c03c266ff99217c00a80e7
 DIST gmtp-1.2.0-i386.tar.gz 1360879 RMD160 a3ee49b250e6232fa88e53ae2339de2926c76689 SHA1 44fd2c811a4a608223d9f862cf1da5ac8f0fc036 SHA256 c3510b7dccbe310048fa0cc9233819d0711c4d58f4143a7bb48297d4900193eb
-DIST gmtp_1.1.0.orig.tar.gz 674220 RMD160 4d465e1d06dac3c09d835cd7ce9593790cff14df SHA1 b7b6057a331b94fd519dca56da2f861ccc937e39 SHA256 2e6718a638426e53d96166750144fc581ad51e1b0ba8d5e5a44683ee95a6bf40
-EBUILD gmtp-1.1.0.ebuild 1072 RMD160 0a3c415329b601d46fab7df6c55f2e21a30d1871 SHA1 bba8c0f056bb6875d1a5e8b2aeddab05fd9d30be SHA256 5398a1fac47643c31e4d02da8600839cb10593cdcd826317008065f31a3a23b8
+DIST gmtp-1.3.0-i386.tar.gz 903333 RMD160 8521795abcbd9866c41ca0889d1339b1caa5a108 SHA1 4f17862ed5defb11360f576e030031b776f8dc78 SHA256 7c75beddebd2bebf53a09f2d2b55cbd75af8f47856486e49d36c98a26443f5a0
 EBUILD gmtp-1.2.0.ebuild 907 RMD160 f61fa9085d31bb02a2d38789f2543faf45f8238e SHA1 42e0cb34d6724504873767f1636f852dbca5d58d SHA256 e12dc4607ac62554897564a46560e3cd5ebf411dfd4f98b7a88d822d077b4d7c
-MISC ChangeLog 731 RMD160 8e67df1262521f16ac27d094ea535a9dc3337790 SHA1 93a11d2a56799fc8b2e8c30f9e04f20e2eab3d66 SHA256 98d78d189ef4c15a4441a1b1d65a6a8ce9d9d1b4982695cdb2bf9018b392dfd0
+EBUILD gmtp-1.3.0.ebuild 907 RMD160 d4404afdf1d12581600d0fbdd20b26a7beed14ac SHA1 216db1ab0370546026951c4e2207aab0ae4eabd9 SHA256 1722708019850417c6dbbdff0ba6a7d56b6f975820c4ddbf423555b947c6812c
+MISC ChangeLog 951 RMD160 32b694a45355643734ffbb9b93130d0000176462 SHA1 e533bef32321a471a5f84297e34cd1f0a4a2aa82 SHA256 4e31ad45783ca3b20c12cdb2decb931d8a76d612b1d05908f58096fa7d443e4e
 MISC metadata.xml 414 RMD160 2f3986b664d5f403d82db23590d23e38f5c0f3fd SHA1 0de4eb43465994bd44c4d003fffbddd29d193ab0 SHA256 5f6a7fa7c74baddbc3ec313b1356694e8eab5ed7e654dc59a0c532c3752386f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6+WRwACgkQodBTJSDyo67VLAD/VksoJqrc+ZFbAK8J4bp3JuvF
-vKa+WkoNi8gye39SGUgA/2pAmtRITWDGr7q4aFhqhm9Lgegnpc0uDHMKHpwHDBu6
-=dXbA
+iF4EAREIAAYFAk71qjMACgkQodBTJSDyo65VzwD8DFVzwJEyO2RanBZ3a0ULYUI0
+5Dt6jqAefkRMck82ob4A/2sKIGYW4tx5Jb+DRT/T1cGifVTTlfI24ktPiXiKptQd
+=CxXC
 -----END PGP SIGNATURE-----
diff --git a/media-sound/gmtp/files/makefile-gentoo.patch b/media-sound/gmtp/files/gmtp-1.3.0-makefile-gentoo.patch
index 438bb3d89189..28c58b37338c 100644
--- a/media-sound/gmtp/files/makefile-gentoo.patch
+++ b/media-sound/gmtp/files/gmtp-1.3.0-makefile-gentoo.patch
@@ -1,25 +1,25 @@
-diff -U 3 -dHrN gMTP-orig/Makefile gMTP/Makefile
---- gMTP-orig/Makefile	2011-07-22 22:43:46.000000000 +0100
-+++ gMTP/Makefile	2011-07-22 23:47:35.000000000 +0100
+diff -U 3 -dHrN gMTP/Makefile gMTP.new/Makefile
+--- gMTP/Makefile	2011-12-15 05:57:19.000000000 +0100
++++ gMTP.new/Makefile	2011-12-24 11:16:52.211115913 +0100
 @@ -1,7 +1,7 @@
  # gMTP Sync tool
  
  PKG_NAME = gmtp
 -PREFIX ?= /usr/local
 +PREFIX ?= /usr
- VER = 1.1.0
+ VER = 1.3.0
  # Note: If you update above, please update the config.h and pkginfo file as well.
  
-@@ -28,7 +28,7 @@
+@@ -36,7 +36,7 @@
  GCONFTOOL = gconftool-2
  TAR = tar
  
--CFLAGS += -c -g -O
+-CFLAGS += -c -g #-O
 +CFLAGS += -c
  LDFLAGS += 
  LIBS +=
  
-@@ -115,7 +115,7 @@
+@@ -123,7 +123,7 @@
  	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/applications
  	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/pixmaps
  	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/gconf
@@ -28,7 +28,7 @@ diff -U 3 -dHrN gMTP-orig/Makefile gMTP/Makefile
  	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/locale
  	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/locale/es
  	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/locale/it
-@@ -143,17 +143,17 @@
+@@ -151,17 +151,17 @@
  	$(INSTALL) -m 644 images/view-refresh.png $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)
  	$(INSTALL) -m 644 misc/gMTP.desktop $(DESTDIR)$(PREFIX)/share/applications
  	$(INSTALL) -m 644 images/icon.png $(DESTDIR)$(PREFIX)/share/pixmaps
@@ -49,7 +49,7 @@ diff -U 3 -dHrN gMTP-orig/Makefile gMTP/Makefile
  
  install-gtk3: gmtp $(catalogues)
  	$(INSTALL) -d $(DESTDIR)$(PREFIX)
-@@ -215,7 +215,7 @@
+@@ -223,7 +223,7 @@
  	rm -f  $(DESTDIR)$(PREFIX)/share/$(PKG_NAME)/*
  	rm -f  $(DESTDIR)$(PREFIX)/share/applications/gMTP.desktop
  	rm -f  $(DESTDIR)$(PREFIX)/share/pixmaps/gMTPicon.png
@@ -58,9 +58,9 @@ diff -U 3 -dHrN gMTP-orig/Makefile gMTP/Makefile
  	rm -f  $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.gnome.gMTP.gschema.xml
  	rm -f  $(DESTDIR)$(PREFIX)/share/locale/es/LC_MESSAGES/gmtp.mo
  	rm -f  $(DESTDIR)$(PREFIX)/share/locale/fr/LC_MESSAGES/gmtp.mo
-diff -U 3 -dHrN gMTP-orig/pkginfo gMTP/pkginfo
---- gMTP-orig/pkginfo	2011-07-22 22:43:46.000000000 +0100
-+++ gMTP/pkginfo	2011-07-22 22:44:02.000000000 +0100
+diff -U 3 -dHrN gMTP/pkginfo gMTP.new/pkginfo
+--- gMTP/pkginfo	2011-11-29 14:18:41.000000000 +0100
++++ gMTP.new/pkginfo	2011-12-24 11:16:57.790091128 +0100
 @@ -1,5 +1,5 @@
  CLASSES=none
 -BASEDIR=/usr/local
diff --git a/media-sound/gmtp/gmtp-1.1.0.ebuild b/media-sound/gmtp/gmtp-1.3.0.ebuild
index 1365d60a6b4f..2e51bcd7fe29 100644
--- a/media-sound/gmtp/gmtp-1.1.0.ebuild
+++ b/media-sound/gmtp/gmtp-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmtp/gmtp-1.1.0.ebuild,v 1.4 2011/11/12 11:30:18 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmtp/gmtp-1.3.0.ebuild,v 1.1 2011/12/24 10:32:11 tomka Exp $
 
 EAPI=4
 
@@ -8,10 +8,7 @@ inherit eutils gnome2-utils
 
 DESCRIPTION="simple MP3 player client for MTP based devices"
 HOMEPAGE="http://gmtp.sourceforge.net/"
-# Upstream's download was broken once, switch to sf download on bump!
-# This file was fetched from Debian mirrors
-SRC_URI="mirror://gentoo/${PN}_${PV}.orig.tar.gz
-		 http://dev.gentoo.org/~tomka/files/${PN}_${PV}.orig.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PF}-i386.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -30,7 +27,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/gMTP"
 
 src_prepare() {
-	epatch "${FILESDIR}/makefile-gentoo.patch"
+	epatch "${FILESDIR}/${PF}-makefile-gentoo.patch"
 }
 
 pkg_preinst() {