bump to 1.3.0, remove 1.1.0

(Portage version: 2.1.10.41/cvs/Linux x86_64)

3 files changed, 23 insertions, 19 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/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() {