[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/, x11-libs/fltk/files/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     0fad2b329f67ec94d2373e9d10bd2fd155aa9e6e
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  2 03:34:06 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 03:34:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fad2b32

x11-libs/fltk: Clean up patches.

Package-Manager: portage-2.3.0

 x11-libs/fltk/files/fltk-1.3.0-share.patch   | 5 -----
 x11-libs/fltk/files/fltk-1.3.2-desktop.patch | 8 ++++----
 x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch | 4 ++--
 x11-libs/fltk/fltk-1.3.9999.ebuild           | 2 --
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/x11-libs/fltk/files/fltk-1.3.0-share.patch b/x11-libs/fltk/files/fltk-1.3.0-share.patch
index 4b4267a..af2092a 100644
--- a/x11-libs/fltk/files/fltk-1.3.0-share.patch
+++ b/x11-libs/fltk/files/fltk-1.3.0-share.patch
@@ -1,8 +1,3 @@
- fluid/Makefile |   20 ++++++++++----------
- 1 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/fluid/Makefile b/fluid/Makefile
-index 1cb3210..9d438a5 100644
 --- a/fluid/Makefile
 +++ b/fluid/Makefile
 @@ -82,16 +82,16 @@ install: all

diff --git a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
index abec41a..ef72ba9 100644
--- a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
+++ b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
@@ -1,5 +1,5 @@
---- fltk-1.3.2/fluid/fluid.desktop
-+++ fltk-1.3.2/fluid/fluid.desktop
+--- a/fluid/fluid.desktop
++++ b/fluid/fluid.desktop
 @@ -6,5 +6,5 @@
  Icon=fluid
  Terminal=false
@@ -7,8 +7,8 @@
 -MimeType=application/x-fluid
 +MimeType=application/x-fluid;
  Categories=Development;GUIDesigner;
---- fltk-1.3.2/fluid/x-fluid.desktop
-+++ fltk-1.3.2/fluid/x-fluid.desktop
+--- a/fluid/x-fluid.desktop
++++ b/fluid/x-fluid.desktop
 @@ -1,6 +1,6 @@
  [Desktop Entry]
  Type=MimeType

diff --git a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
index 701f04c..ed487e7 100644
--- a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
+++ b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/479774
 
---- src/Fl_JPEG_Image.cxx
-+++ src/Fl_JPEG_Image.cxx
+--- a/src/Fl_JPEG_Image.cxx
++++ b/src/Fl_JPEG_Image.cxx
 @@ -155,7 +155,7 @@
    
    jpeg_create_decompress(&dinfo);

diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index 259d66e..7e769f7 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -39,10 +39,8 @@ DEPEND="
 src_prepare() {
 	rm -rf zlib jpeg png || die
 	epatch \
-		"${FILESDIR}"/${PN}-1.3.2-desktop.patch \
 		"${FILESDIR}"/${PN}-1.3.0-share.patch \
 		"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \
-		"${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch \
 		"${FILESDIR}"/${PN}-1.3.3-visibility.patch
 
 	sed -i \