gentoo resync : 01.12.2017

7 files changed, 3 insertions, 344 deletions

diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 7df69418ab29..3e6e02e88a5b 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,11 +1,4 @@
-AUX geeqie-1.2.2-fix_keywords_gtk3.patch 477 BLAKE2B 505cdf973143356cc33258ffeeddf82561d63175b077f9838191c2c43567286181a6c2f26d2dfec1fc10089150640fb23f64c1c28efb68f9ceaaf7ba119eea31 SHA512 adcda745352c62cbc811238229aeacd8e0016c17367d60ce7571a21e9891270a5506c247b8b8adb602a655d32619cb118fb29ed85edeccddec0949600c936b3f
-AUX geeqie-1.2.3-fix_keywords_gtk3.patch 3168 BLAKE2B ce20e3c613d32096c4280d85cf6f3b9386a081a10acaf3914634c8e9a8b3255c74873adefad9690a26b32b75e4762bd8fcfa4b8d75f7f6d9f193e4cfeb8e7398 SHA512 76214c6ce36c20f8af6daba22e4ea7d5021c4e5efd544298e25e7383918c94ab47cf7ce33768bf34eb7f1b319e46ad1100d3e34dd902a32234c01ea53be8be4f
 AUX geeqie-1.3-stdstring.patch 2247 BLAKE2B 4569351aff9f524c17b9ad08634406e21d6e1b88921e12e320f5a618665aad9287b05d4d16d90f3a701fb7de73514005dfd5bf7d09e87313a97cc594849a9b2b SHA512 f26122a1419f795393174340f0e4a5b341d8341664840347730a8b19b1956d4c684b6a5a5183357250364a040eacc18267aab272789ac65ece9ece56d6b2dadf
-DIST geeqie-1.2.2.tar.xz 1156616 SHA256 e1cbc403650730e2f4092159e4347c858d3d81e4374d2a51d635234ba90b3ee3 SHA512 0e134802b42061e76ec2f2d9069ab13ebcab17f889b04917e15aba74a208a4c4ffa5a957f45eb5bd14917d98d2d6250c1085cb065a1ae487050e5e2f325c14c4 WHIRLPOOL 78e960d2e551675b6474d30cfb0119177e14d1930a23b930c5b7ef7757092085db423713be495a4fcb51112c293eb88b12fe511b5b4bf64c86c27b8e410cb318
-DIST geeqie-1.2.3.tar.xz 1129804 SHA256 2629bf33a9070fad4804b1ef051c3bf8a8fdad3bba4e6188dc20588185003248 SHA512 1bb2a6e5782cdafb4aeb1ab9247f7d43f4ef341594ea795214c136ba1fe416cf8bc37faa43462780eca3d0b07a7852e27719f8d23c8bdb42c899857846b4f7b1 WHIRLPOOL 8b4ee7218bb1562695c5c5322e684652f9318f04ed77bc0a54e70dd46f63801a7f0cc9c9b37346a58f6c1059278c07f980dec439dd753f2f87ce7f2a98e01566
-DIST geeqie-1.3.tar.xz 1141820 SHA256 4b6f566dd1a8badac68c4353c7dd0f4de17f8627b85a7a70d5eb1ae3b540ec3f SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718 WHIRLPOOL 8b3e54ae6cf8f8a633225df4f5058c29a7dd56adc63c9594cb995929d4cebb3b07d76a257a454506330f32673ac9a57ce63eb3fbf33126ed4cbccc7542910720
-EBUILD geeqie-1.2.2-r2.ebuild 1785 BLAKE2B 5e0ab155ce1d941cadd0373650124b30263c8feca2b67b817860f5661164e1aa06a11b25f6e2861b5722db0a329fd240aae0c67a597a2a72bb6e46ce5cb0e04f SHA512 8703001eea8161e35965a9e414983aa1b493efae3edbe6b8b6fed2d221e7df72ed299c393b1072f1deb1ddfe3f5703f638916bbcca63862a765aa6d7d2648f87
-EBUILD geeqie-1.2.3-r1.ebuild 1781 BLAKE2B 7930b651a8102df97dc2dc00bfc17233ff0a297d5fd8a13ba6936d830d8a17631aa45a3fed868c33fa60fc5b6560e95859daadb1301896058190198a75454cea SHA512 425e3cdad548f852c470e3758cbc66be3e53ac47b543c190d8f24c7f60b682211afc6f278738d21e534569da9bc3ce23237b1fdae60bfb635d597d678312c1dc
-EBUILD geeqie-1.3-r1.ebuild 1942 BLAKE2B bafa7e6f73b0b706c6127528d7bd0cd95ab2b171d21263509e18d6a892a5ce395b05e5a734f93590918858fdfda0c79d889f12482df6e6835cf7be4b88bcf10f SHA512 3d453cb523f5b2cbb72fee0d0d80fe3d1ca014f5d4f9b71b78b16a9c2f9098d4d206b37aff72afc9f0dcc93e462a65016ca0d3a602c6f3736db01e006b6ed0c3
-EBUILD geeqie-1.3.ebuild 1931 BLAKE2B 6953c1e65d14c434e432dd2cfe95c05418b458da4873f7074e7cf0e7e8e9a5f9fe3d955a570c58a548065296b72a0d0b794e87ddea0d37a09929cce246696716 SHA512 3c7751b1a5c6f46b2e9857be84a398ac8d76c73a8708c082da7c34440ab87af5a570295c009de46ceca8f9f83efc1f86f370d007589bf107d64adec1da5606d1
+DIST geeqie-1.3.tar.xz 1141820 BLAKE2B 7a8639a136797c85d1bf96567ed0cae74c5cd0dacb8fac4832ffcb31ead372ac100948f9b65332d749500327c6ec3e7cb195da15980eaf0771ca6b55879dd8e4 SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718
+EBUILD geeqie-1.3-r1.ebuild 1941 BLAKE2B 2ac0dfaa649219e597b6128fd65cc435edb9fb90f6e1c44defa821f9c282b18c208a3553d11dba175b69806f674b9baa0c2348dd7988971adbeb14d43d521e50 SHA512 9116a91a9459f59c9dab49bfd40b29f57ad042ae740d29809cfd55b6df829c73327ef28e1c8a69cee3b14fee2962edc5b002f2f26adb8c0d72ea1f61c17dc91b
 MISC metadata.xml 806 BLAKE2B bdab12aff9617fbcdc5e5e9be5b22d1d48b4a41691375c9a3af8bee2e3c10a511cb9aaf0144a1df2d0988ed9185d36699b45a04e397b532e9ca98ec1a7863ee7 SHA512 f5d2929460a639de62f06abf298d4817ffbf9550892b4ad0eccbb9bb8fbffeb5e399c9184bb1d1367090135af329d36807bf1f7497ec5af77201da631a5f91d4
diff --git a/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch b/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch
deleted file mode 100644
index 99bc10d9b57f..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/bar_keywords.c	2015-05-23 14:20:43.000000000 +0200
-+++ b/src/bar_keywords.c	2015-12-30 00:34:21.453531792 +0100
-@@ -1295,6 +1295,9 @@
- 	g_object_set_data(G_OBJECT(pkd->widget), "pane_data", pkd);
- 	g_signal_connect(G_OBJECT(pkd->widget), "destroy",
- 			 G_CALLBACK(bar_pane_keywords_destroy), pkd);
-+#if GTK_CHECK_VERSION(3,0,0)
-+	gtk_widget_set_size_request(pkd->widget, -1, 400);
-+#endif
- 	gtk_widget_show(hbox);
- 
- 	scrolled = gtk_scrolled_window_new(NULL, NULL);
diff --git a/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch b/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch
deleted file mode 100644
index 695effaffaef..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From a174e816ae993e7ee9731651b2674dbfdec9ed95 Mon Sep 17 00:00:00 2001
-From: Colin Clark <cclark@mcb.net>
-Date: Wed, 30 Mar 2016 15:36:32 +0100
-Subject: [PATCH] Bug fix #227 + enable user to set height of Keywords pane
-
-Bug #227 Keywords section of Info sidebar doesn't work on GTK3 build
-https://sourceforge.net/p/geeqie/bugs/227/
-
-Permit the user to set the height of the Keywords pane in the Info
-sidebar by editing the line:
-
-<pane_keywords id = "keywords" title = "Keywords" expanded = "true" key
-= "Xmp.dc.subject" height = "200"/>
-
-in the configuration file geeqierc.xml
----
- src/bar_keywords.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/bar_keywords.c b/src/bar_keywords.c
-index f58f348..0eee90c 100644
---- a/src/bar_keywords.c
-+++ b/src/bar_keywords.c
-@@ -113,6 +113,7 @@ struct _PaneKeywordsData
- 	guint idle_id; /* event source id */
- 	FileData *fd;
- 	gchar *key;
-+	gint height;
- };
- 
- typedef struct _ConfDialogData ConfDialogData;
-@@ -249,6 +250,7 @@ static void bar_pane_keywords_write_config(GtkWidget *pane, GString *outstr, gin
- 	write_char_option(outstr, indent, "title", gtk_label_get_text(GTK_LABEL(pkd->pane.title)));
- 	WRITE_BOOL(pkd->pane, expanded);
- 	WRITE_CHAR(*pkd, key);
-+	WRITE_INT(*pkd, height);
- 	WRITE_STRING("/>");
- }
- 
-@@ -1263,7 +1265,7 @@ static void bar_pane_keywords_destroy(GtkWidget *widget, gpointer data)
- }
- 
- 
--static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded)
-+static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded, gint height)
- {
- 	PaneKeywordsData *pkd;
- 	GtkWidget *hbox;
-@@ -1285,6 +1287,7 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
- 
- 	pkd->pane.expanded = expanded;
- 
-+	pkd->height = height;
- 	pkd->key = g_strdup(key);
- 
- 	pkd->expand_checked = TRUE;
-@@ -1295,6 +1298,7 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
- 	g_object_set_data(G_OBJECT(pkd->widget), "pane_data", pkd);
- 	g_signal_connect(G_OBJECT(pkd->widget), "destroy",
- 			 G_CALLBACK(bar_pane_keywords_destroy), pkd);
-+	gtk_widget_set_size_request(pkd->widget, -1, height);
- 	gtk_widget_show(hbox);
- 
- 	scrolled = gtk_scrolled_window_new(NULL, NULL);
-@@ -1417,6 +1421,7 @@ GtkWidget *bar_pane_keywords_new_from_config(const gchar **attribute_names, cons
- 	gchar *title = NULL;
- 	gchar *key = g_strdup(COMMENT_KEY);
- 	gboolean expanded = TRUE;
-+	gint height = 200;
- 	GtkWidget *ret;
- 
- 	while (*attribute_names)
-@@ -1428,13 +1433,14 @@ GtkWidget *bar_pane_keywords_new_from_config(const gchar **attribute_names, cons
- 		if (READ_CHAR_FULL("title", title)) continue;
- 		if (READ_CHAR_FULL("key", key)) continue;
- 		if (READ_BOOL_FULL("expanded", expanded)) continue;
-+		if (READ_INT_FULL("height", height)) continue;
- 
- 
- 		log_printf("unknown attribute %s = %s\n", option, value);
- 		}
- 
- 	bar_pane_translate_title(PANE_KEYWORDS, id, &title);
--	ret = bar_pane_keywords_new(id, title, key, expanded);
-+	ret = bar_pane_keywords_new(id, title, key, expanded, height);
- 	g_free(id);
- 	g_free(title);
- 	g_free(key);
diff --git a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
deleted file mode 100644
index de6fb6131af3..000000000000
--- a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="http://www.geeqie.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug doc exif gtk3 jpeg lcms lirc lua tiff xmp"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	virtual/libintl
-	doc? ( app-text/gnome-doc-utils )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	lirc? ( app-misc/lirc )
-	lua? ( >=dev-lang/lua-5.1:= )
-	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
-	tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix_keywords_gtk3.patch
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	# clutter does not compile, gps depends on clutter
-	local myconf="--disable-dependency-tracking
-		--with-readmedir=/usr/share/doc/${PF}
-		--disable-clutter
-		--disable-gps
-		$(use_enable debug debug-log)
-		$(use_enable gtk3)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		$(use_enable lua)
-		$(use_enable lirc)
-		$(use_enable tiff)"
-
-	if use exif || use xmp; then
-		myconf="${myconf} --enable-exiv2"
-	else
-		myconf="${myconf} --disable-exiv2"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -f "${D}/usr/share/doc/${PF}/COPYING"
-	# Application needs access to the uncompressed file
-	docompress -x /usr/share/doc/${PF}/README
-}
-
-pkg_postinst() {
-	elog "Some plugins may require additional packages"
-	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
-	elog "- RAW images plugin: media-gfx/ufraw"
-}
diff --git a/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild b/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild
deleted file mode 100644
index 947373854fe5..000000000000
--- a/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="http://www.geeqie.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc exif gtk3 jpeg lcms lirc lua tiff xmp"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	virtual/libintl
-	doc? ( app-text/gnome-doc-utils )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	lirc? ( app-misc/lirc )
-	lua? ( >=dev-lang/lua-5.1:= )
-	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
-	tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix_keywords_gtk3.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# clutter does not compile, gps depends on clutter
-	local myconf="--disable-dependency-tracking
-		--with-readmedir=/usr/share/doc/${PF}
-		--disable-clutter
-		--disable-gps
-		$(use_enable debug debug-log)
-		$(use_enable gtk3)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		$(use_enable lua)
-		$(use_enable lirc)
-		$(use_enable tiff)"
-
-	if use exif || use xmp; then
-		myconf="${myconf} --enable-exiv2"
-	else
-		myconf="${myconf} --disable-exiv2"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -f "${D}/usr/share/doc/${PF}/COPYING"
-	# Application needs access to the uncompressed file
-	docompress -x /usr/share/doc/${PF}/README
-}
-
-pkg_postinst() {
-	elog "Some plugins may require additional packages"
-	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
-	elog "- RAW images plugin: media-gfx/ufraw"
-}
diff --git a/media-gfx/geeqie/geeqie-1.3-r1.ebuild b/media-gfx/geeqie/geeqie-1.3-r1.ebuild
index 285783cea80b..dd9b8e0511a4 100644
--- a/media-gfx/geeqie/geeqie-1.3-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug doc exif gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp"
 
 RDEPEND="gtk3? ( x11-libs/gtk+:3 )
diff --git a/media-gfx/geeqie/geeqie-1.3.ebuild b/media-gfx/geeqie/geeqie-1.3.ebuild
deleted file mode 100644
index c9e69adfdcac..000000000000
--- a/media-gfx/geeqie/geeqie-1.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="http://www.geeqie.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc exif gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp"
-
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	virtual/libintl
-	doc? ( app-text/gnome-doc-utils )
-	gpu-accel? ( media-libs/clutter-gtk )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	lirc? ( app-misc/lirc )
-	lua? ( >=dev-lang/lua-5.1:= )
-	map? ( media-libs/libchamplain:0.12 )
-	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
-	tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-REQUIRED_USE="gpu-accel? ( gtk3 )
-	map? ( gpu-accel )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-stdstring.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# clutter does not compile, gps depends on clutter
-	local myconf="--disable-dependency-tracking
-		--with-readmedir=/usr/share/doc/${PF}
-		$(use_enable debug debug-log)
-		$(use_enable gpu-accel)
-		$(use_enable gtk3)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		$(use_enable lua)
-		$(use_enable lirc)
-		$(use_enable map)
-		$(use_enable tiff)"
-
-	if use exif || use xmp; then
-		myconf="${myconf} --enable-exiv2"
-	else
-		myconf="${myconf} --disable-exiv2"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -f "${D}/usr/share/doc/${PF}/COPYING"
-	# Application needs access to the uncompressed file
-	docompress -x /usr/share/doc/${PF}/README
-}
-
-pkg_postinst() {
-	elog "Some plugins may require additional packages"
-	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
-	elog "- RAW images plugin: media-gfx/ufraw"
-}