gentoo resync : 09.03.2018

5 files changed, 7 insertions, 193 deletions

diff --git a/media-plugins/gimp-resynthesizer/Manifest b/media-plugins/gimp-resynthesizer/Manifest
index 2c47aecd84b4..d207882ed271 100644
--- a/media-plugins/gimp-resynthesizer/Manifest
+++ b/media-plugins/gimp-resynthesizer/Manifest
@@ -1,7 +1,3 @@
-AUX gimp-resynthesizer-0.16-makefile.patch 655 BLAKE2B 82c6710af10b4642e66bd725f27f96d2a174718ad34bf49359932d8c5115340f3479db8612a086c55b837c9f5e644bf4542a57843b83307f3627ba1abc3a5130 SHA512 bef9c4e34df739a5d25f03c15b822fcd69aa31c3231ac1c6afb49b196dc5f9a4d237a79e8fd501151787d9a20afb449174ade3279b00eac5b7b15d4ade36f575
-AUX smart-remove.scm 4157 BLAKE2B 5483c59bcf1851f6b8009dc5df097c207e6ba556abace28e9386724a7ebb94e26b33b079872eb1f18d82fa38a47b36f439a452e687d7943781e2b237d5713a60 SHA512 057ea904445f81ab391fde660f8fa0c195b1a0211431947c87f3f0d048d3af973e9c810b9749c91741092f46a989ce512227783775db6fada5fbd1fd84bedf05
 DIST gimp-resynthesizer-2.0.3.tar.gz 11097693 BLAKE2B 51e064ed1a5d31dc3162a27b76c8b68d7652e3efdf2acad1844f4c76b47a6485b4e43788993c344a7154cddd8d2ac1ebda7c24f871ea8d6af332b1f15759f396 SHA512 de18fa41f5c3feaeff3365cc57b49f404f20439c6f84b212bc5cc76ee21f34566b8d093bebef1e6f27dbe3df6a23570dc091d23044a0967957ec0e97a16fa7c4
-DIST resynthesizer-0.16.tar.gz 18241 BLAKE2B d042220a1d9f71af6be16fd9a0c0b81cf46911dc22ae123915455e4952e3dbe4ba3f87098cbb05ab679090beb590f5943db76d8f923c2a67d6aaa18758004dc7 SHA512 6838dfe919e45bd8e8eea570127a586dc5718ee57504748d1de192bd627e26670bd7d82a25b7cb56a4fe597f3eb2c9d0c922da318fec5b6bf8a52801a856b662
-EBUILD gimp-resynthesizer-0.16.ebuild 1054 BLAKE2B 589a66e1cd34f483e3cc5e3a48e191513bb4c666cfcfd3df628e7292cf0f86223a351d37582eeaf47ebe2b9aca9ea42cf6c0ace27003a082ee499df18f94eb83 SHA512 45a172ce2eb60d0dce3127e893146675f3f14887b9ed62258b041aeff787cb2a5452f200cef935932ef66ac9ce3d2526c3726ced9a6d9b8940f65592f1dfd6e7
-EBUILD gimp-resynthesizer-2.0.3.ebuild 543 BLAKE2B 3b90cf6f1305f2a30b3dd872b32e772b62c88a77c5876c1cc75d35dd7aa591466341e24072f45855f8b1a6b95dc836c61e3d23421b4bc5ec00df7c45fba11372 SHA512 d051d5a29c34fdb6861618fa42d6073c3be2c7689fdfefa732a346fcae7ebb3c2b3674e3f4eb18a8956c17f24076d20fbc4bd0fc0933f70f4635e40ae1a8be74
+EBUILD gimp-resynthesizer-2.0.3-r1.ebuild 638 BLAKE2B 1deb41999e301dfdd83f8be6463048efbf0e8fc7de10c0da8fa50e92438d0c1b92ef366a90761784d205c67b3cd5b886ba43b08b0fa6e1b5aa9702843c1c9253 SHA512 ad6b7a3bbce824062c967096e6e1e40cd9cc7da560727e56274c69ca749c450c3d045a400f2170a5a3a7c026cc06b49e7df06edfec8f0c0e3629f9f545b326ed
 MISC metadata.xml 877 BLAKE2B 3e503fa59883ed68b3e57793430c0b3d88056a20548dd2de9498f96f0fb881700c93001df8162d63425ec21f817e27aa4c1c526219313818294b72862e133610 SHA512 cba06ed54fa07f78d5a114d679e978135acd13bff7eb69746e51c0f9f8ccc28c77b2692d1d1fb842aa695d7c01ce2e1cc096a362b385f7780fb60dd0c94f56fe
diff --git a/media-plugins/gimp-resynthesizer/files/gimp-resynthesizer-0.16-makefile.patch b/media-plugins/gimp-resynthesizer/files/gimp-resynthesizer-0.16-makefile.patch
deleted file mode 100644
index 04d25511e61c..000000000000
--- a/media-plugins/gimp-resynthesizer/files/gimp-resynthesizer-0.16-makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile-orig	2010-03-28 00:42:45.759669796 +0300
-+++ Makefile	2010-03-28 00:43:33.024936557 +0300
-@@ -1,15 +1,8 @@
--CC = g++
--
- GIMPTOOL = gimptool-2.0
- 
- GIMP_LDFLAGS=`$(GIMPTOOL) --libs`
- GIMP_CFLAGS=`$(GIMPTOOL) --cflags`
- 
--CFLAGS=$(GIMP_CFLAGS) -O3 -fno-common -ffast-math -frename-registers -fomit-frame-pointer
--
--LDFLAGS=$(GIMP_LDFLAGS) -lm
--
--
- all: resynth
- 	@echo
- 	@echo 'Now type "make install" to install resynthesizer'
-@@ -30,7 +23,7 @@
- 	@echo
- 
- resynth: resynth.cc
--	$(CC) $(CFLAGS) -o $@ resynth.cc $(LDFLAGS)
-+	$(CXX) $(CFLAGS) $(GIMP_CFLAGS) $(LDFLAGS) -o $@ resynth.cc $(GIMP_LDFLAGS) -lm
- 
- clean:
- 	-rm -f *~ *.o core resynth
diff --git a/media-plugins/gimp-resynthesizer/files/smart-remove.scm b/media-plugins/gimp-resynthesizer/files/smart-remove.scm
deleted file mode 100644
index 7324ebd56741..000000000000
--- a/media-plugins/gimp-resynthesizer/files/smart-remove.scm
+++ /dev/null
@@ -1,111 +0,0 @@
-
-; Smart Remove
-
-; Smart selection eraser.
-; Requires resynthesizer plug-in.
-; Paul Harrison (pfh@logarithmic.net)
-
-; Versions
-; lloyd konneker lkk 3/29/2009 Fix passing workLayerID to plugin.  
-; Other non-functional changes: comments, error checking, menu item, blurb, license
-;
-
-; License:
-;
-; This program is free software; you can redistribute it and/or modify
-; it under the terms of the GNU General Public License as published by
-; the Free Software Foundation; either version 2 of the License, or
-; (at your option) any later version.
-;
-; This program is distributed in the hope that it will be useful,
-; but WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.
-;
-; The GNU Public License is available at
-; http://www.gnu.org/copyleft/gpl.html
-
-; lkk comment: creates stencil selection in a temp dupe image to pass as source drawable to plugin
-
-
-(define (script-fu-smart-remove img layer corpus-border)
-  (cond
-    ((= 0 (car (gimp-selection-bounds img))) 
-      (gimp-message "To use this script-fu, first select the region you wish to remove.")
-    )
-    (#t (let*
-      (
-        (dupe (car (gimp-image-duplicate img)))
-        (channel (car (gimp-selection-save dupe)))
-        (workLayerID -1)    ; lkk
-      )
-
-      ; lkk flatten (so stencil gets everything visible) and to activate a layer in dupe
-      ; (gimp-message-set-handler 1)	; debug messages to console
-      (gimp-image-flatten dupe)         ; lkk !!! flatten, activates layer, but deletes alpha
-      (set! workLayerID (car (gimp-image-get-active-layer dupe)))
-      (cond ((= -1 workLayerID) 
-           (gimp-message "Failed get active layer")
-      )     )
-      ; lkk plugin requires equal count of channels, target and source.  Plugin should be changed to relax this reqt.
-      (cond ((= 1 (car (gimp-drawable-has-alpha layer)))
-           ;debug (gimp-message "Adding alpha")
-           (if (not (car (gimp-layer-add-alpha workLayerID)))  (gimp-message "Failed add alpha") )
-      )     )
-      
-      
-      ; lkk comment: grow selection, invert, save to channel2, cut a hole size of orig selection
-      ; lkk in the grown selection in channel2, select channel2, un invert
-      (gimp-selection-grow dupe corpus-border)
-      (gimp-selection-invert dupe)
-      (let*
-        (
-	      (old-background (car (gimp-context-get-background)))
-          (channel2 (car (gimp-selection-save dupe)))
-        )
-
-        (gimp-selection-load channel)
-	    (gimp-context-set-background '(255 255 255))
-        (if (not (car (gimp-edit-clear channel2))) (gimp-message "Failed edit clear") )
-	    (gimp-context-set-background old-background)
-        (gimp-selection-load channel2)
-      )
-
-      (gimp-selection-invert dupe)
-      ; lkk comment: crop the dupe to size of stencil to save memory
-      (let*
-        (
-          (bounds (gimp-selection-bounds dupe))
-	      (x1 (nth 1 bounds))
-	      (y1 (nth 2 bounds))
-	      (x2 (nth 3 bounds))
-	      (y2 (nth 4 bounds))
-        )
-
-        (gimp-image-crop dupe (- x2 x1) (- y2 y1) x1 y1)
-      )
-
-      (gimp-selection-invert dupe)  ; lkk !!! plugin requires inverted selection
-      ;(gimp-display-new dupe)   ; debug to see the stencil as passed to plugin
-      ;(gimp-displays-flush)     ; debug
-      
-      ; lkk originally 7th param was layer (the in layer), which only SEEMED to work.  Should be the stencil.
-      (plug-in-resynthesizer 1 img layer 0 0 1 workLayerID -1 -1 0.0 0.117 16 500)
-
-      (gimp-image-delete dupe)
-      (gimp-displays-flush)
-) ) ))
-
-(script-fu-register "script-fu-smart-remove"
-                    "<Image>/Filters/Enhance/Heal selection..."
-		    "Extend surrounding texture to cover the selection.  Works best with homogenous, not regular surroundings. \
-Requires separate resynthesizer plug-in."
-		    "Paul Harrison (pfh@logarithmic.net)"
-		    "Copyright 2000 Paul Harrison, 2009 Lloyd Konneker"
-		    "13/9/2000"
-		    "RGB* GRAY*"
-		    SF-IMAGE "Input Image" 0
-		    SF-DRAWABLE "Input Layer" 0
-		    SF-ADJUSTMENT "Radius to take texture from" '(50 7 1000 1.0 1.0 0 1)
-)
-
diff --git a/media-plugins/gimp-resynthesizer/gimp-resynthesizer-0.16.ebuild b/media-plugins/gimp-resynthesizer/gimp-resynthesizer-0.16.ebuild
deleted file mode 100644
index 03265bdf6ce1..000000000000
--- a/media-plugins/gimp-resynthesizer/gimp-resynthesizer-0.16.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-MY_PN="${PN#gimp-}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="GIMP plug-ing for texture synthesis"
-HOMEPAGE="http://www.logarithmic.net/pfh/resynthesizer"
-SRC_URI="http://www.logarithmic.net/pfh-files/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-gfx/gimp"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	cp "${FILESDIR}/smart-remove.scm" "${S}" || die
-
-	tc-export CXX
-}
-
-src_install() {
-	exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins
-	doexe resynth || die
-
-	insinto $(gimptool-2.0 --gimpdatadir)/scripts
-	doins smart-enlarge.scm smart-remove.scm || die
-
-	dodoc README || die
-}
-
-pkg_postinst() {
-	elog "The Resynthesizer plugin is accessible from the menu:"
-	elog "* Filters -> Map -> Resynthesize"
-	elog "* Filters -> Enhance -> Smart enlarge/sharpen"
-	elog "* Filters -> Enhance -> Heal selection"
-}
diff --git a/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3.ebuild b/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r1.ebuild
index 1a6a43534b3b..3e8b63d21d1d 100644
--- a/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3.ebuild
+++ b/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=6
 
-inherit autotools
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1
 
 MY_PN="${PN#gimp-}"
 MY_P="${MY_PN}-${PV}"
@@ -17,8 +19,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="media-gfx/gimp"
-RDEPEND="${DEPEND}"
+DEPEND="media-gfx/gimp
+	virtual/pkgconfig"
+RDEPEND="media-gfx/gimp[python,${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${MY_P}"