reinit the tree, so we can have metadata

9 files changed, 506 insertions, 0 deletions

diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
new file mode 100644
index 000000000000..fee984af4321
--- /dev/null
+++ b/media-gfx/geeqie/Manifest
@@ -0,0 +1,13 @@
+AUX geeqie-1.2.2-fix_keywords_gtk3.patch 477 SHA256 4744e41249d5c010a6fbc694fec2a092c5249a7684cf83e521c64536a9dd6390 SHA512 adcda745352c62cbc811238229aeacd8e0016c17367d60ce7571a21e9891270a5506c247b8b8adb602a655d32619cb118fb29ed85edeccddec0949600c936b3f WHIRLPOOL 71b9c6f140f51a06224c5320bd2c35328396595a18ab4d7ddf1c6acac2b51b8f9e4dd6f7dfe6c77f878677328213b698445b186b95d1f9ac1fa89d6207635b86
+AUX geeqie-1.2.3-fix_keywords_gtk3.patch 3168 SHA256 51ad3b6071021fb3ade78750327d867c1881dc663df4843dbbc408f9f495b459 SHA512 76214c6ce36c20f8af6daba22e4ea7d5021c4e5efd544298e25e7383918c94ab47cf7ce33768bf34eb7f1b319e46ad1100d3e34dd902a32234c01ea53be8be4f WHIRLPOOL fda440792a0a07e9238f32ec0e615f5a170acd14f3f108be84f2e250c90a57c56190033af06cc4a9a1e98ee8ac19d8e7ef3404050465ca417a741a6d28558e93
+AUX geeqie-1.3-stdstring.patch 2247 SHA256 a7d36c7fe77b90eade68ad306b55ec5314d4d01a1a5db9aab65f9f5d405a54ae SHA512 f26122a1419f795393174340f0e4a5b341d8341664840347730a8b19b1956d4c684b6a5a5183357250364a040eacc18267aab272789ac65ece9ece56d6b2dadf WHIRLPOOL 4595bc1fc4824c947016c575a8a2af8b26a4d1d5c3d168d6dac887d5f76c9369ac527ddb16f5db0604e3defc9b8a992b24e2802fa9b528b384069b5a8657ff0a
+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 SHA256 44be5242a2a0abd6ae43ae5f07d276aeef6a8264486cfa86637c35f062bb4989 SHA512 8703001eea8161e35965a9e414983aa1b493efae3edbe6b8b6fed2d221e7df72ed299c393b1072f1deb1ddfe3f5703f638916bbcca63862a765aa6d7d2648f87 WHIRLPOOL 59bf45ee95d6a041276d282b99fc19ff27f3c461e577d1bc6fa35c7c17359adf8f4cf28094b0e77dd42966e1011c3b4db773b0af736566bce47b0b4462d35b9e
+EBUILD geeqie-1.2.3-r1.ebuild 1781 SHA256 2f1191e470c4a5de056dd6dd851acf15039d0ff87d81c6b125fe34a8de80bee8 SHA512 425e3cdad548f852c470e3758cbc66be3e53ac47b543c190d8f24c7f60b682211afc6f278738d21e534569da9bc3ce23237b1fdae60bfb635d597d678312c1dc WHIRLPOOL 3b6f69bbee4e6dd22904bf299a581908ec24d1b728b9d4049f59deb2b731d1e1364075c92be25b60f4fcb9fdd84973e13f784aab6789a9017a4c1de80faf9724
+EBUILD geeqie-1.3-r1.ebuild 1943 SHA256 269e52fd48e93a558fba8c2e51c25bf783bfeb085bd28da63a6b3ebe7fdf12c4 SHA512 ac4bd6fbabda938a02bc99f8a2d6c51857dbda60c8a6f4011a9eb255bcc59e577193831469f84feb9c62e75c27cfada3a4c91b811aa592905f7a175f1c76c8fb WHIRLPOOL 1ddf209225ded1551629b59c035f4ed58df5f655bfe445b46646262682463e8af02bc9ad51ca77df1f8c324b34357e15b0e66f0c265ce1dbac0ea1fdba214972
+EBUILD geeqie-1.3.ebuild 1931 SHA256 2265f76f9b04b9afab27916755dd967e26265cecd1f2f8f83477280e35f20f28 SHA512 3c7751b1a5c6f46b2e9857be84a398ac8d76c73a8708c082da7c34440ab87af5a570295c009de46ceca8f9f83efc1f86f370d007589bf107d64adec1da5606d1 WHIRLPOOL 45be52ad0f918ed550ec9ec8bd888e1aa42e792afc7d6dd1b0867a9c5b823aa8c39771287c90247abb1b306c1a7228767647f8d6169bc496fa97da615534beb5
+MISC ChangeLog 5757 SHA256 4fda454943c101f42a7ffba538f84adbd912c761d6ed23d9ab5be3c8ee8798dd SHA512 0226f8e9bd30569db9568b2358232d7f7c11af39c3746e6ea969288f7f8cefc38b5a4989c571df93c61bc3173e915c987cdf73008bc71534fe416a41d1169d19 WHIRLPOOL ec6f9d70c3fc011d6b9b0311ad18cdf32c4e800cf0c4083150b397443a59b88341683b213860393b5665b2f20450f1cd6f69c440d3bdafc9e134dcb17f354ef9
+MISC ChangeLog-2015 6448 SHA256 bb2985e10ea688c1b54f14bc525f960dbf1c377768a4fc139aa506ebf56f6d76 SHA512 2a711623b0244311092623f3491146b63ab849839050efb125c703a98457e6a6fc1949deb8a2f141f9a844fd386211d551636b76e8a8f2ea2d9f8f19f7cfb594 WHIRLPOOL c2d9b9dd54fd2342d180fa320f63c7b0928c5aac672cf7e1978ece776f3b680456ae89379e730c07378e0933966130771d50ea3d4ca3ff13b3bdfcd4e479429d
+MISC metadata.xml 806 SHA256 db397d9f869537aba84cab87b1871c57757e2e599b0d4b954dd716e379eee4ab SHA512 f5d2929460a639de62f06abf298d4817ffbf9550892b4ad0eccbb9bb8fbffeb5e399c9184bb1d1367090135af329d36807bf1f7497ec5af77201da631a5f91d4 WHIRLPOOL c890d6f0bc44a49864a54d9380ff1269a241e6c204237e409c9cbeff318c087f4f67a4df06332c39315f149caa112dce4496567d0240fe71e43a894ae9395cfb
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
new file mode 100644
index 000000000000..99bc10d9b57f
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.2.2-fix_keywords_gtk3.patch
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 000000000000..695effaffaef
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.2.3-fix_keywords_gtk3.patch
@@ -0,0 +1,88 @@
+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/files/geeqie-1.3-stdstring.patch b/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch
new file mode 100644
index 000000000000..fb58db6a5283
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch
@@ -0,0 +1,63 @@
+From 0b044d1d685307e5755917e31d56a1a3104cd505 Mon Sep 17 00:00:00 2001
+From: David Kalnischkies <david@kalnischkies.de>
+Date: Fri, 27 May 2016 12:04:40 +0100
+Subject: [PATCH] Work around changed c++11 std::string implementation
+
+Bug was already partly fixed by 96db62d but there was even more
+positions that was unseen by Solomon.
+
+The patch is originally from Debian bug report #800350.
+
+Signed-off-by: Klaus Ethgen <Klaus@Ethgen.de>
+---
+ src/exiv2.cc | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/exiv2.cc b/src/exiv2.cc
+index 1dbe118..49b8e07 100644
+--- a/src/exiv2.cc
++++ b/src/exiv2.cc
+@@ -25,6 +25,7 @@
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
+ #include <iostream>
++#include <string>
+ 
+ // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
+ #ifndef EXIV2_TEST_VERSION
+@@ -1140,8 +1141,9 @@ guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width,
+ 
+ 	if (!exif->image()) return NULL;
+ 
++	std::string const path = exif->image()->io().path();
+ 	/* given image pathname, first do simple (and fast) file extension test */
+-	gboolean is_raw = filter_file_class(exif->image()->io().path().c_str(), FORMAT_CLASS_RAWIMAGE);
++	gboolean is_raw = filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE);
+ 
+ 	if (!is_raw && requested_width == 0) return NULL;
+ 
+@@ -1241,10 +1243,10 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques
+ 	if (!exif) return NULL;
+ 	if (!exif->image()) return NULL;
+ 
+-	const char* path = exif->image()->io().path().c_str();
++	std::string const path = exif->image()->io().path();
+ 
+ 	/* given image pathname, first do simple (and fast) file extension test */
+-	if (!filter_file_class(path, FORMAT_CLASS_RAWIMAGE)) return NULL;
++	if (!filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE)) return NULL;
+ 
+ 	try {
+ 		struct stat st;
+@@ -1255,9 +1257,9 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques
+ 
+ 		RawFile rf(exif->image()->io());
+ 		offset = rf.preview_offset();
+-		DEBUG_1("%s: offset %lu", path, offset);
++		DEBUG_1("%s: offset %lu", path.c_str(), offset);
+ 
+-		fd = open(path, O_RDONLY);
++		fd = open(path.c_str(), O_RDONLY);
+ 		if (fd == -1)
+ 			{
+ 			return NULL;
diff --git a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..de6fb6131af3
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
@@ -0,0 +1,75 @@
+# 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
new file mode 100644
index 000000000000..947373854fe5
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.2.3-r1.ebuild
@@ -0,0 +1,77 @@
+# 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
new file mode 100644
index 000000000000..a113ceba2fb3
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.3-r1.ebuild
@@ -0,0 +1,82 @@
+# 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="${EPREFIX}"/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"
+}
diff --git a/media-gfx/geeqie/geeqie-1.3.ebuild b/media-gfx/geeqie/geeqie-1.3.ebuild
new file mode 100644
index 000000000000..c9e69adfdcac
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.3.ebuild
@@ -0,0 +1,82 @@
+# 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"
+}
diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml
new file mode 100644
index 000000000000..4ccccdc6d6e3
--- /dev/null
+++ b/media-gfx/geeqie/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool</longdescription>
+	<use>
+		<flag name="gpu-accel">Enable GPU acceleration support - experimental</flag>
+		<flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 instead of <pkg>x11-libs/gtk+</pkg>:2</flag>
+		<flag name="map">Enable items map display - experimental</flag>
+	</use>
+</pkgmetadata>