Remove old versions, new homepage, host tarball on my devspace for now (bug #544850)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x00F7AB331B0F097F

14 files changed, 35 insertions, 709 deletions

diff --git a/media-gfx/geeqie/ChangeLog b/media-gfx/geeqie/ChangeLog
index d2c96354ba0d..5da97f30f83e 100644
--- a/media-gfx/geeqie/ChangeLog
+++ b/media-gfx/geeqie/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-gfx/geeqie
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.31 2015/01/26 10:43:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/ChangeLog,v 1.32 2015/05/29 15:41:50 voyageur Exp $
+
+  29 May 2015; Bernard Cafarelli <voyageur@gentoo.org> -geeqie-1.0-r4.ebuild,
+  -geeqie-1.1.ebuild, geeqie-1.2-r1.ebuild,
+  -files/geeqie-1.0-automake-1.11.patch, -files/geeqie-1.0-copy_chown.patch,
+  -files/geeqie-1.0-filedata_compare.patch,
+  -files/geeqie-1.0-fix_fullscreen.patch, -files/geeqie-1.0-lfs_support.patch,
+  -files/geeqie-1.0-ui_pathsel.patch, -files/geeqie-1.0-up_path_restore.patch,
+  -files/geeqie-1.0-vflist-refresh.patch,
+  -files/geeqie-1.1-fix_comment_update.patch:
+  Remove old versions, new homepage, host tarball on my devspace for now (bug
+  #544850)
 
   26 Jan 2015; Agostino Sarubbo <ago@gentoo.org> geeqie-1.2-r1.ebuild:
   Stable for x86, wrt bug #536862
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 6c4ca2bab7b8..2eff7dd75ddc 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,39 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX geeqie-1.0-automake-1.11.patch 609 SHA256 0b576ab74fbfd0c1ad2c89b6ba50521bf74550820748e13f8ed2c90dfe4097af SHA512 adcaf43d0566873620896a215bab40cc46c116b493665aa5f524f38e9689eb5f2115134409b83a107c8de813cc6f4b22f84666e2d006e68c93f6eb03ea897812 WHIRLPOOL 58e69c26858ef9e871ac23034e2bccb489febb8716eefdcaf7c28c56c48faff7d2b2a66252b31909b113a0b963ed16f47ef1f682e4e2f71b987be3cb719f3e03
-AUX geeqie-1.0-copy_chown.patch 1805 SHA256 c84815794a6cdd6be6b0ab954760013f372b6fc1084d3cd1b5cfa67beefd7ba7 SHA512 ccfb987b7575b7cd89f041380203c93c33876bd40c8c1b82331233944384382db43e90cbdb8179d69a6af8fc4df2191a240cd4c006f4495f3e0a79ef7542d6c8 WHIRLPOOL 08608c6a9e9221cb9f8e134683f24877641481a7254be3b4840c9222486f82ce1b6650eacd4b5282ce1defb17b93f154244f183d693be4e26c365b1739087779
-AUX geeqie-1.0-filedata_compare.patch 1690 SHA256 c82471f323e8b01b46eb60f2be549456e1d75f08ab5cd3bf5144e493c5222ebb SHA512 87686969b0a6441dbe12734cefcf120c5e2fb59fdac8766f853eb1dfc7bbabc57f1e49d0d420074dbb139ae574bd61670ff1f6deb1cba5996d796bc864cb32dc WHIRLPOOL 54c84082145b9e3ed94463d7572bd16617e78afbea90524e8ea0a380ec66312bdf792fcfd6421215abc71e1154e2fa6945d6932e9086d365baf8c326fdf418f9
-AUX geeqie-1.0-fix_fullscreen.patch 4917 SHA256 b1e612f8373eb1dc457c64fdd5082edf988a63c9deefaf4c7bfd1d564c3f4bb2 SHA512 a8edeb90a13d4c71aab187d9ad0602ed72e1d8ef32f5ed5c811e5dd4060f0b944e1a7957c9a3339a32b421b3c0842631456b9d4cb4cf1c1cfce2aeb5e9ab8112 WHIRLPOOL a480c87159af3d3608358851e3ebe21260e8fc6e1964b82cdd6c920259b070bbf8395e6e5a6e85766d0f419eb565411e99cf9e45c68e8d293f2b0d9797a514e6
-AUX geeqie-1.0-lfs_support.patch 227 SHA256 1a12a99df42636cac424fc901bc7ce74c23b477b818812319986e1dcbb00c03e SHA512 a98dafe689bcbb5cb2229bee9c7418b6810725ad04a781560f1a6f4212f6554674f8a288991573e486c438364bdee1cc0f27c9c13dfc61f358a05999f1b5bbea WHIRLPOOL 5f41132122bb85c93974966c65d05fdb69406df722a6247c74dd2f7ba915f3c67b01e7c2fbe8e9f73ce817bdf9f7b2ab9a26c3143f0c6b4c7cd0ca70c48075c1
-AUX geeqie-1.0-ui_pathsel.patch 1307 SHA256 2a42dc2a5ee4e4d5e4636d424e1adb6a707c74bde4a5ec28b24ff8fafee164ed SHA512 f17d058d1fcc6557459adf13ff44f928d0523856913b8756da4aff197e468899be3d4e279cb923e46db1348df5c40ee1ece9d8561d4ff966456f0d0f23f88197 WHIRLPOOL fd914d5281e1309b32425e631aa0701f52a440b6a558cd32a9a48871a24c489b01e37713ee94729af2d0c284d38a05771ede033304e27d3d1745f5270de98eed
-AUX geeqie-1.0-up_path_restore.patch 626 SHA256 29cdffb3d1fe2c6c4823ba55e194dac39c59f56aec7aa84814435b656d2ee27a SHA512 21a7375957050a7d5c5650475215f03f2129faef524ef9a61fdd716761e979fbb4b2c619b6d736afe84ee0340a5ebdf391cd111ca18fb7cfd0593ad8cab8abd7 WHIRLPOOL 6c57255f238b2e91d6b51fab9e8dd43c814049e27f02e744d20d397b76dfb5097fdd96af0b673479638cdb2e11999ae11524240d634ae2041558e440e80cd2ff
-AUX geeqie-1.0-vflist-refresh.patch 1968 SHA256 5f7d53a22a42ed7afcb425bf3a9bb358e40225a6a356c2b3791349a2eda67bc0 SHA512 ceb5874f895a5a0ef1e60fc97e7ec4d99c508713bffceff616839abe216b223baf3cddcc2dab431c74e75bd4a72b3ec38c9e43a018a81c46fa3bf0d949152e90 WHIRLPOOL 63b58135799dc62cd1ecd7c95ef47bd025a21687c0a15498fd9e3e13f4067441623eadffdd128cc837612387df9cc3ecc8faef55d70a609cbbbb27b1305cd344
-AUX geeqie-1.1-fix_comment_update.patch 4649 SHA256 cd1ce814ea556f51e840e36b85a2316e30f57a887531688a2b20f481a3061612 SHA512 4b6e6b25264a7b9075dc2718fb48a0eb8157f695f206a047efc94d593ed5624bd86b47f38931bee24fc8a5ec0be75f4ea51338996f8ca8be56982d5d3584a786 WHIRLPOOL 38cbfec26e7b9f477e739de87609e442439a3a1d9c2a8ba37fccff6fa77869e74e14bfbe5977cbb447cd8649e97eef98c02483cae9820eb9958a99f95b686a6d
 AUX geeqie-1.2-fix-lcms2-integration.patch 1088 SHA256 fb6b64d267f7cd5b78ab87f79bac36a91678fa919247ab90bdef1ef0a1a15ccd SHA512 0258c22f56759116c312e2df2541a5ac0a8d248a6fe9282421b4dcd5838cd6c31241c7629d1b7664960469f475b7fd09f99d2d6db0cf416b38ce44928b745b86 WHIRLPOOL 468ae7b7c36d1459908b678d39b9b1c4a1a7fa9326596cc8cb60a53c038ae8a4656b6c23f25033d43a5a094aba67c114c7fd80ce64e907e9cb6a689b342871d3
 AUX geeqie-1.2-fix_version.patch 374 SHA256 450692df420c993f8a91a7b5b71cf40c2dcc8b21a546533b4b894b4ff6e8c353 SHA512 f9ea503a6a367838380e20ed7f102b9ce8c22286ab1c1ba6b33741ecc5d82770e0cf147462bc3a42bf3b602fc5116b9d267e8125af374ddae48352b14bb82fcd WHIRLPOOL 446ef59f4eb635c85c67cd72329e28ab004936d1a73f92ac62174bfbef9adfa8786fd88432a7fe880ec3b3d6f9489d684d8309bbe33b89643bb9ea6f64cffe8f
-DIST geeqie-1.0.tar.gz 1934236 SHA256 d1ad64666446c1d490437a9441267e8d7c1b9dc6ab640716b213e386d9211fdd SHA512 34ad22468e1faaad8842df8c172e305149415812a9421edc590bf1717ab8ce787e55152f9348d39b69e2c5642cba5abd4e574c0b46d06bc741994bcecaa8a18a WHIRLPOOL af3406b27b491fe8836f39faf5013091a3c5b74287e94d9022b2b3cc337ce338e586fc287de90e272a284400926af97b41e32af5e6e87babc770bb1b66cddc89
-DIST geeqie-1.1.tar.gz 1966211 SHA256 5544e81c29917a647f19bfe800d9f0dd1cd5b890329feebd9abd80927e1afecf SHA512 3949b2717c70adb4e6b2c6db002042bcd1c3e9a5345991d3cba41de1765709ccf70fadfcde9dd221b1da03ef14512c746ab424cbc0d09617c52dbf445ee0243d WHIRLPOOL 1c62611f597e08b51b0306dac2af5af1893d4c1b96726bbc6220b28d1779275516624ff3865dec0056d93a1af24edcce1a3a0f2891b954be19bab1b7d728a929
 DIST geeqie-1.2.tar.gz 1904764 SHA256 f13fc2489fb9bed31ed48aec8b2a3a573c11cd6e036f1b07ed2cf6495ccc75dd SHA512 cd27cc480cc649f6ba6ea2997bf9a3dc1aa3f655e6f949de27bb4bbfa79927126851604005bf0a0e2be86683f5b9b06dbfb86b919f828e54a79bafcdd6a0be92 WHIRLPOOL 82e25e743b62566dd99a630fb347966195a93b8eba51a300907e04e7113c5bc39a0bf74da28eeba6325558ff86d1bdea80cfe8c7fedf70ce5466e224e0b648c0
-EBUILD geeqie-1.0-r4.ebuild 1714 SHA256 13b1e5dac08c772ad44d80d1c5cfa6e8036554cc918380b9795da0630607cae6 SHA512 0630e439aa0967d38f255afb182e3ecd6caf1755faf8098914714215b0e54bd1ae5231d31fcb6b9a73f2cf9e5f770e17ddb55c674fa02fc9348aed7828ad0058 WHIRLPOOL bb0988192d3bc96bd11ad06705a0e2ac8f152dd2dbff065fe9e3b2ff809b46d98272004effbc0e87c455e2a475193ad92344fafb5179f8bc4f4319a14c49889b
-EBUILD geeqie-1.1.ebuild 1530 SHA256 fdd5fe84fa8c94f1a613953e5105acd297e5f8174393621c4535e1010dcfe00d SHA512 5f4623a257a5444fe84e6065eea1051838d9e656587d4d5e6968879a76cd3545fc9ceec1e28ebb4f9074e63b8671b0aa93b33b1eee28f310636d353200c62fa7 WHIRLPOOL eae5e011e904cd31665dcfd4b932025b47b5c5a3fb6641ff961fb83d76fb8b105d707f717fad6bea384680876424cc8d8d8e0709a557c954ee02b6fdf1fedd4f
-EBUILD geeqie-1.2-r1.ebuild 1837 SHA256 48d9430a66f331702361ef6eeab34812971e2d288ec69c45eb63a347151d1a56 SHA512 ffff05219c8869b3eabbfaa8e7765463a5386df695b1edcdaa401e418749bb6b9c3f982e3561355999c9ec4b60490cc35cfda7a81c2deff2d2c3e84bcac0a89c WHIRLPOOL f7c718cc95b8024f433f72e5ef33bb5fb2d870c2786be9e8b642e819c0984a2efb4150e3821f347939384c8ca51c76bc475d60da7a63c79400cb406e3b2cb0d9
-MISC ChangeLog 5864 SHA256 c7bbc66f4dd114028dde91e3a23a2384df9dab2274826b8df8f97909b3799689 SHA512 d5896894a6a9e73e6e44cd3eb07d65a93a00fcd15e9e7634543f9d780344103c08091f5d0d114553f1c49d5d57ed9981cef1cfc4049960421959898c26ccec89 WHIRLPOOL 9b01fe7f7aa41f63df038b5459765d66fa7ec93c8bd7a9df64d5521693dab3bfa7fcf5e69df58a044b7b1fe013267ab03ecfe4beba87748dc99b66dc274879c2
+EBUILD geeqie-1.2-r1.ebuild 1898 SHA256 680ce715b606515bd01fc13ff6c90c94007f2c3b0dd5bd678f09f7f9313a8240 SHA512 93547317b49bc5648e991c2d73789c9779a35df20e60a681bb30c27e831865fb216bf01f2020df2044016e9402b551b259fab67992cbb4b4d803aa1f729fa721 WHIRLPOOL afb193bf0bbcdb6f4e666da26ec9eb05e51a493b1e4bc2cbc144119585eab16bdd87dc58e2ca9db114f0f2365d8ec2adb3d8055854afb3cfda63084502a73b75
+MISC ChangeLog 6448 SHA256 bb2985e10ea688c1b54f14bc525f960dbf1c377768a4fc139aa506ebf56f6d76 SHA512 2a711623b0244311092623f3491146b63ab849839050efb125c703a98457e6a6fc1949deb8a2f141f9a844fd386211d551636b76e8a8f2ea2d9f8f19f7cfb594 WHIRLPOOL c2d9b9dd54fd2342d180fa320f63c7b0928c5aac672cf7e1978ece776f3b680456ae89379e730c07378e0933966130771d50ea3d4ca3ff13b3bdfcd4e479429d
 MISC metadata.xml 527 SHA256 0d271c29ec180ce0cad2f6129d90fcbd562996c76d59d56063c3e29d6e68b877 SHA512 7ba8db75611e19112aeff58820af895493f9153916972ba088673afd0dc9c4e9dd894e34c4a0b8cab413e5c8f777827178e407e0153ebf5be31d5b9ad6810cd2 WHIRLPOOL 9720b49bf795bcd36b03eda5d616a913c8da455791dbd8c8e73e44e6690c7569153fc5eac942c157b8dfb9cc505bd700a88fbd0565d0c01faa2658cca5077e34
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUxhpKAAoJELp701BxlEWfTAIQAMQF1wU5YXyeEKYYGzcniwni
-NkA76Y9NYJGkE8Nob4EeyyfVkqyYVWt88DldTvzqto6wFwvPnN0wLzdh62eK4sQJ
-IlfSHdPusJADWRjvqXaJMgYXfhEsG0Q7dOiqvYx+Qa2Quvov+W79EFJhZb+T+lyo
-AHLPRAZVnrcBJ58bXFun1E0Qgh976XdfjY3nghTD5w1TNWa/ar9kdMpYmqcaG/0l
-CN8eBhHxCtwpV66+vzZ5vUReEZb7gPEZfEEfExvUgsnVKtq6WU2DfrDqUlgTe340
-41EENjnAwPq2dI4Kw8EhyNQR96uln0FUcjOOo+d2HubraSciWm72XGPUJy70mLNR
-Mn21nsK8ayIGysTpiFsmg3SVFAUi+sQbGs7Atah+w+Uyo6J6ieYtBE6K55j2FuE7
-6X66wR/Agi6if9hjAMRzx/INRhGNT//nPKxT51LdBEr3d46urmYnpHAAjNXpzDKm
-mVWVbsMiYCPv+MGhwP2JpQeKF7DTvVrtadSf7ks+WbEGXq04fKeaYdtN64juNurK
-P8dtDoHkeTliPizDsJmPwMxkoORhwbBPx51JdMIRKqSfmY8SNjJYsF1o2vvcLSR3
-axSbTCQDz2Mj6ft3bzfuGGKf8RbBwzIrUeARsIwvHDmtWFSDfJQYD1f1iWzg6SqB
-YCh/5XR0ZO7DVJCfXPHH
-=ViJV
+iQJ8BAEBCABmBQJVaIjAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw
+MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/TwkQALgXawcsDT8HLF2GqvtsWTeb
+bjKAREwLokiCljohT0yHdXm8WjuzoTbMVCwapm2Q4MKXm2fuO7YM0r0phv2b6O6R
+iaAxjgOUMit3eJfT7UnEWgDebHgeuKidBjssYlTAnSDImAbb5bq5A9J4ALStbjB6
+hRUbz2a9abGKIWp9Ke9nUnlA/YEsGXgQYsJ7688LhrVdGd/y1rts9r/grzXKKbot
+R+A2+71k6MPtzXbF8wDWkh1haCdEe1YRERT83JjtCF3dpsZldpYr46EQc4lDWjGl
+LyFzyS4IQMDdHW0ltpzbV19cA6ZdinhotuxKjyMi0WHA6Ps2zZZFPs1c47tYnGzL
+1GAvm1C8wYoJOe2gaqDa+AomvtOw90SxBLJ9knGrcXFnabGc/5Zr7xS/Im9s8db7
+WkpmsfqTw0zd7uejhc+sS1OWTTNcVW45ed1qO2uDmT0652QK6nc0n+CeIL+LVW2Y
+6nIrYhTIKMQRjf8SM8HRntbpu1dh3hl0GRnS0lgg6Fa1rc8u1HFSaK0fF35G+dT+
+H9IEqJ/bZMEY1+sqJ2u4LbdKWRuWYE6Y39zrEUs8wWrqva2up2Z5aoLiY0OJ0obE
+rSQvBPDv0Lw6RLzg7C7lgx0PMnosvWVyHgji0iKUJBD2qFUDr+TbPsvckPQJYL1m
+UlKWTVTdA6blZDGNqOB5
+=rgJu
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/geeqie/files/geeqie-1.0-automake-1.11.patch b/media-gfx/geeqie/files/geeqie-1.0-automake-1.11.patch
deleted file mode 100644
index b6a33997f239..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.0-automake-1.11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-=== modified file 'doc/Makefile.am'
---- doc/Makefile.am	2012-06-02 13:33:57 +0000
-+++ doc/Makefile.am	2012-06-02 13:35:03 +0000
-@@ -2,9 +2,6 @@
- 
- helpdir = @htmldir@
- 
--# empty help_DATA just installs the directory
--help_DATA = 
--
- EXTRA_DIST = docbook2html.sh docbook
- 
- html/GuideIndex.html: docbook/GuideIndex.xml
-@@ -19,6 +16,7 @@
- 
- install-data-hook: html
- 	if [ -x "$(GNOME_DOC_TOOL)" ]; then \
-+		$(MKDIR_P) "$(DESTDIR)$(helpdir)" || exit 1; \
- 		cd html; for f in * ; do $(INSTALL_DATA) "$$f" "$(DESTDIR)$(helpdir)/$$f" ; done; \
- 		ln -s GuideIndex.html "$(DESTDIR)$(helpdir)/index.html" ; \
- 	fi
-
diff --git a/media-gfx/geeqie/files/geeqie-1.0-copy_chown.patch b/media-gfx/geeqie/files/geeqie-1.0-copy_chown.patch
deleted file mode 100644
index 9aef27d69fed..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.0-copy_chown.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From dc8933e3c0ae3e0021d13beb666d6729267c7624 Mon Sep 17 00:00:00 2001
-From: Vladislav Naumov <vnaum@vnaum.com>
-Date: Thu, 16 Dec 2010 21:55:03 +0100
-Subject: [PATCH] Fix bug 2999830: do not report failed chown() on copy.
-
-Debian bug 574853 reported by Ian Zimmerman <itz@buug.org>
-
-I was trying to copy images from my camera which is mounted as a USB
-mass storage device.  The files on the mount are owned by root, and
-geeqie tries to chown (and chgrp) the copy, fails, and displays an
-error message.  This is only mildly annoying when copying a single
-file, but when I want to copy multiple files the failure stops the
-operation after the first file.
-
-Patch by Vladislav Naumov <vnaum@vnaum.com>
-
-This patch ignores chown errors, while still doing chown
-(so root still can copy files preserving ownership).
-
-http://sourceforge.net/tracker/?func=detail&aid=2999830&group_id=222125&atid=1054680
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=574853 (original report)
----
- src/ui_fileops.c |   10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/ui_fileops.c b/src/ui_fileops.c
-index aa3cc8d..33c6560 100644
---- a/src/ui_fileops.c
-+++ b/src/ui_fileops.c
-@@ -490,8 +490,14 @@ gboolean copy_file_attributes(const gchar *s, const gchar *t, gint perms, gint m
- 
- 		/* set the dest file attributes to that of source (ignoring errors) */
- 
--		if (perms && chown(tl, st.st_uid, st.st_gid) < 0) ret = FALSE;
--		if (perms && chmod(tl, st.st_mode) < 0) ret = FALSE;
-+		if (perms)
-+			{
-+			ret = chown(tl, st.st_uid, st.st_gid);
-+			/* Ignores chown errors, while still doing chown
-+			   (so root still can copy files preserving ownership) */
-+			ret = TRUE;
-+			if (chmod(tl, st.st_mode) < 0) ret = FALSE;
-+			}
- 
- 		tb.actime = st.st_atime;
- 		tb.modtime = st.st_mtime;
--- 
-1.6.1
-
diff --git a/media-gfx/geeqie/files/geeqie-1.0-filedata_compare.patch b/media-gfx/geeqie/files/geeqie-1.0-filedata_compare.patch
deleted file mode 100644
index 50a1c0f8ac88..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.0-filedata_compare.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 18d80ca385e38b3bf9bc4ef36264bb4d430aa1f6 Mon Sep 17 00:00:00 2001
-From: Vladimir Nadvornik <nadvornik@suse.cz>
-Date: Fri, 30 Sep 2011 23:57:31 +0200
-Subject: [PATCH] fixed filelist_sort_compare_filedata to not return 0 no different files
-
----
- src/filedata.c |   15 ++++++++++++---
- 1 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/filedata.c b/src/filedata.c
-index f6e3896..78fd74e 100644
---- a/src/filedata.c
-+++ b/src/filedata.c
-@@ -852,6 +852,7 @@ static gboolean filelist_sort_ascend = TRUE;
- 
- gint filelist_sort_compare_filedata(FileData *fa, FileData *fb)
- {
-+	gint ret;
- 	if (!filelist_sort_ascend)
- 		{
- 		FileData *tmp = fa;
-@@ -875,7 +876,8 @@ gint filelist_sort_compare_filedata(FileData *fa, FileData *fb)
- 			break;
- #ifdef HAVE_STRVERSCMP
- 		case SORT_NUMBER:
--			return strverscmp(fa->name, fb->name);
-+			ret = strverscmp(fa->name, fb->name);
-+			if (ret != 0) return ret;
- 			break;
- #endif
- 		default:
-@@ -883,9 +885,16 @@ gint filelist_sort_compare_filedata(FileData *fa, FileData *fb)
- 		}
- 
- 	if (options->file_sort.case_sensitive)
--		return strcmp(fa->collate_key_name, fb->collate_key_name);
-+		ret = strcmp(fa->collate_key_name, fb->collate_key_name);
- 	else
--		return strcmp(fa->collate_key_name_nocase, fb->collate_key_name_nocase);
-+		ret = strcmp(fa->collate_key_name_nocase, fb->collate_key_name_nocase);
-+
-+	if (ret != 0) return ret;
-+	
-+	/* do not return 0 unless the files are really the same 
-+	   file_data_pool ensures that original_path is unique 
-+	*/
-+	return strcmp(fa->original_path, fb->original_path);
- }
- 
- gint filelist_sort_compare_filedata_full(FileData *fa, FileData *fb, SortType method, gboolean ascend)
--- 
-1.6.1
-
diff --git a/media-gfx/geeqie/files/geeqie-1.0-fix_fullscreen.patch b/media-gfx/geeqie/files/geeqie-1.0-fix_fullscreen.patch
deleted file mode 100644
index 0547395a3b2b..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.0-fix_fullscreen.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-Description: Make fullscreen modes actually use the full screen.
- The default fullscreen mode now leaves everything up to the window manager,
- which usually produces the best result.  Custom fullscreen modes now use
- override-redirect to ensure docks and panels never obscure the image.
-Author: Daniel van Vugt <vanvugt@gmail.com>
-Bug: http://sourceforge.net/support/tracker.php?aid=2925034
-Bug-Ubuntu: https://launchpad.net/bugs/788321
-Forwarded: yes
-
-=== modified file 'src/fullscreen.c'
---- old/src/fullscreen.c	2010-02-26 10:41:38 +0000
-+++ new/src/fullscreen.c	2011-08-16 03:55:04 +0000
-@@ -218,75 +218,65 @@
- 				 void (*stop_func)(FullScreenData *, gpointer), gpointer stop_data)
- {
- 	FullScreenData *fs;
--	GdkScreen *screen;
--	gboolean same;
--	gint x, y;
--	gint w, h;
--	GdkGeometry geometry;
- 
- 	if (!window || !imd) return NULL;
- 
-+	DEBUG_1("full screen requests screen %d", options->fullscreen.screen);
-+
- 	fs = g_new0(FullScreenData, 1);
--
- 	fs->cursor_state = FULLSCREEN_CURSOR_HIDDEN;
--
- 	fs->normal_window = window;
- 	fs->normal_imd = imd;
--
- 	fs->stop_func = stop_func;
- 	fs->stop_data = stop_data;
--
--	DEBUG_1("full screen requests screen %d", options->fullscreen.screen);
--	fullscreen_prefs_get_geometry(options->fullscreen.screen, window, &x, &y, &w, &h,
--				      &screen, &same);
--
--	fs->window = window_new(GTK_WINDOW_TOPLEVEL, "fullscreen", NULL, NULL, _("Full screen"));
--
--	/* this requests no decorations, if you still have them complain to the window manager author(s) */
--	gtk_window_set_decorated(GTK_WINDOW(fs->window), FALSE);
-+	fs->window = window_new(GTK_WINDOW_TOPLEVEL, "fullscreen", NULL, NULL,
-+		_("Full screen"));
- 
- 	if (options->fullscreen.screen < 0)
--		{
--		/* If we want control of the window size and position this is not what we want.
--		 * Geeqie needs control of which monitor(s) to use for full screen.
--		 */
-+		{  /* Fullscreen as determined by the window manager... */
- 		gtk_window_fullscreen(GTK_WINDOW(fs->window));
- 		}
--	else if (options->fullscreen.above)
--		{
--		/* request to be above other windows */
--		gtk_window_set_keep_above(GTK_WINDOW(fs->window), TRUE);
-+	else
-+		{  /* Custom fullscreen modes. Done by hand, the hard way... */
-+		GdkScreen *screen;
-+		gint x, y, w, h;
-+		GdkGeometry geometry;
-+		GtkWindow *gtkwin = GTK_WINDOW(fs->window);
-+		GdkWindow *gdkwin;
-+
-+		fullscreen_prefs_get_geometry(options->fullscreen.screen,
-+			window, &x, &y, &w, &h, &screen, NULL);
-+
-+		if (options->fullscreen.above)
-+			gtk_window_set_keep_above(gtkwin, TRUE);
-+	
-+		gtk_window_set_screen(gtkwin, screen);
-+		gtk_window_set_decorated(gtkwin, FALSE);
-+		gtk_window_set_resizable(gtkwin, FALSE);
-+		gtk_container_set_border_width(GTK_CONTAINER(fs->window), 0);
-+	
-+		geometry.min_width = w;
-+		geometry.min_height = h;
-+		geometry.max_width = w;
-+		geometry.max_height = h;
-+		geometry.base_width = w;
-+		geometry.base_height = h;
-+		gtk_window_set_geometry_hints(gtkwin, fs->window, &geometry,
-+			GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE |
-+			GDK_HINT_BASE_SIZE);
-+	
-+		gtk_window_set_default_size(gtkwin, w, h);
-+		gtk_window_move(gtkwin, x, y);
-+	
-+		gtk_widget_realize(fs->window);
-+		gdkwin = gtk_widget_get_window(fs->window);
-+		if (gdkwin != NULL)
-+			gdk_window_set_override_redirect(gdkwin, TRUE);
- 		}
- 
--	gtk_window_set_resizable(GTK_WINDOW(fs->window), FALSE);
--
--	gtk_window_set_screen(GTK_WINDOW(fs->window), screen);
--	gtk_container_set_border_width(GTK_CONTAINER(fs->window), 0);
- 	g_signal_connect(G_OBJECT(fs->window), "delete_event",
- 			 G_CALLBACK(fullscreen_delete_cb), fs);
- 
--	geometry.min_width = w;
--	geometry.min_height = h;
--	geometry.max_width = w;
--	geometry.max_height = h;
--	geometry.base_width = w;
--	geometry.base_height = h;
--	geometry.win_gravity = GDK_GRAVITY_STATIC;
--	/* By setting USER_POS and USER_SIZE, most window managers will
--	 * not request positioning of the full screen window (for example twm).
--	 *
--	 * In addition, setting gravity to STATIC will result in the
--	 * decorations of twm to not effect the requested window position,
--	 * the decorations will simply be off screen, except in multi monitor setups :-/
--	 */
--	gtk_window_set_geometry_hints(GTK_WINDOW(fs->window), fs->window, &geometry,
--				      GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE | GDK_HINT_BASE_SIZE |
--				      GDK_HINT_WIN_GRAVITY |
--				      GDK_HINT_USER_POS);
--
--	gtk_window_set_default_size(GTK_WINDOW(fs->window), w, h);
--	gtk_window_move(GTK_WINDOW(fs->window), x, y);
--
- 	fs->imd = image_new(FALSE);
- 
- 	gtk_container_add(GTK_CONTAINER(fs->window), fs->imd->widget);
-@@ -393,7 +383,11 @@
- 			else
- 				{
- 				gdk_screen_get_monitor_geometry(screen, j, &rect);
--				subname = g_strdup_printf("%s %d", _("Monitor"), j + 1);
-+				subname = gdk_screen_get_monitor_plug_name(screen, j);
-+				if (subname == NULL)
-+					{
-+					subname = g_strdup_printf("%s %d", _("Monitor"), j + 1);
-+					}
- 				}
- 
- 			sd = g_new0(ScreenData, 1);
-
diff --git a/media-gfx/geeqie/files/geeqie-1.0-lfs_support.patch b/media-gfx/geeqie/files/geeqie-1.0-lfs_support.patch
deleted file mode 100644
index 28a8fc4e807c..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.0-lfs_support.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in.orig	2011-10-03 23:34:49.000000000 +0200
-+++ configure.in	2011-10-03 23:34:58.000000000 +0200
-@@ -128,6 +128,7 @@
- AC_PROG_CXX
- AC_STDC_HEADERS
- AC_ARG_PROGRAM
-+AC_SYS_LARGEFILE
- IT_PROG_INTLTOOL([0.35.0])
- 
- 
diff --git a/media-gfx/geeqie/files/geeqie-1.0-ui_pathsel.patch b/media-gfx/geeqie/files/geeqie-1.0-ui_pathsel.patch
deleted file mode 100644
index 019ce413ebb0..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.0-ui_pathsel.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 738ed337ffaa80276901451847fa83f865b1c439 Mon Sep 17 00:00:00 2001
-From: Klaus Ethgen <Klaus@Ethgen.de>
-Date: Sat, 9 Apr 2011 19:47:30 +0100
-Subject: [PATCH] Do not delete path settings when adding new directory
-
-This patch will change the way, geeqie is mangling the path name in the
-rename (copy) dialog when creating new directory. Will fix the bugs
-Debian:529531 and SF:2795791.
----
- src/ui_pathsel.c |   11 +++++++++--
- 1 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/ui_pathsel.c b/src/ui_pathsel.c
-index 6b69c05..d58c5ac 100644
---- a/src/ui_pathsel.c
-+++ b/src/ui_pathsel.c
-@@ -740,7 +740,10 @@ static void dest_new_dir_cb(GtkWidget *widget, gpointer data)
- 	tmp = gtk_entry_get_text(GTK_ENTRY(dd->entry));
- 	if (!isname(tmp))
- 		{
--		path = g_strdup(tmp);
-+		buf = remove_trailing_slash(tmp);
-+		path = g_strdup(buf);
-+		g_free(buf);
-+		buf = remove_level_from_path(path);
- 		from_text = TRUE;
- 		}
- 	else
-@@ -765,7 +768,11 @@ static void dest_new_dir_cb(GtkWidget *widget, gpointer data)
- 		GtkListStore *store;
- 		const gchar *text;
- 
--		if (from_text) gtk_entry_set_text(GTK_ENTRY(dd->entry), dd->path);
-+		if (from_text)
-+			{
-+			dest_populate(dd, buf);
-+			g_free(buf);
-+			}
- 
- 		store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(dd->d_view)));
- 
--- 
-1.6.1
-
diff --git a/media-gfx/geeqie/files/geeqie-1.0-up_path_restore.patch b/media-gfx/geeqie/files/geeqie-1.0-up_path_restore.patch
deleted file mode 100644
index 22cc71d129f5..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.0-up_path_restore.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: src/view_dir_list.c
-===================================================================
---- src/view_dir_list.c	(revision 1917)
-+++ src/view_dir_list.c	(working copy)
-@@ -309,7 +309,7 @@
- 		base = remove_level_from_path(vd->dir_fd->path);
- 		if (strcmp(base, dir_fd->path) == 0)
- 			{
--			old_path = g_strdup(vd->dir_fd->name);
-+			old_path = g_strdup(vd->dir_fd->path);
- 			}
- 		g_free(base);
- 		}
-@@ -329,7 +329,7 @@
- 		while (work && !found)
- 			{
- 			FileData *fd = work->data;
--			if (strcmp(old_path, fd->name) == 0) found = fd;
-+			if (strcmp(old_path, fd->path) == 0) found = fd;
- 			work = work->next;
- 			}
- 
diff --git a/media-gfx/geeqie/files/geeqie-1.0-vflist-refresh.patch b/media-gfx/geeqie/files/geeqie-1.0-vflist-refresh.patch
deleted file mode 100644
index a5e0aa32c218..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.0-vflist-refresh.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Nur geeqie-1.0-orig/src/view_file_list.c geeqie-1.0/src/view_file_list.c
---- geeqie-1.0-orig/src/view_file_list.c	2010-02-17 22:21:19.000000000 +0100
-+++ geeqie-1.0/src/view_file_list.c	2011-04-15 13:47:10.727936556 +0200
-@@ -943,8 +943,6 @@
- 	GList *work;
- 	GtkTreeIter iter;
- 	gboolean valid;
--	gint num_ordered = 0;
--	gint num_prepended = 0;
- 
- 	valid = gtk_tree_model_iter_children(GTK_TREE_MODEL(store), &iter, parent_iter);
- 
-@@ -993,17 +991,11 @@
- 
- 				if (valid)
- 					{
--					num_ordered++;
- 					gtk_tree_store_insert_before(store, &new, parent_iter, &iter);
- 					}
- 				else
- 					{
--					/*
--					    here should be used gtk_tree_store_append, but this function seems to be O(n)
--					    and it seems to be much faster to add new entries to the beginning and reorder later
--					*/
--					num_prepended++;
--					gtk_tree_store_prepend(store, &new, parent_iter);
-+					gtk_tree_store_append(store, &new, parent_iter);
- 					}
- 
- 				vflist_setup_iter(vf, store, &new, file_data_ref(fd));
-@@ -1026,7 +1018,6 @@
- 				}
- 			else
- 				{
--				num_ordered++;
- 				if (fd->version != old_version || force)
- 					{
- 					vflist_setup_iter(vf, store, &iter, fd);
-@@ -1043,31 +1034,12 @@
- 
- 	while (valid)
- 		{
--		FileData *old_fd;
-+		FileData *old_fd = NULL;
- 		gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, FILE_COLUMN_POINTER, &old_fd, -1);
- 		file_data_unref(old_fd);
- 
- 		valid = gtk_tree_store_remove(store, &iter);
- 		}
--		
--	/* move the prepended entries to the correct position */
--	if (num_prepended)
--		{
--		gint i;
--		gint num_total = num_prepended + num_ordered;
--		gint *new_order = g_malloc(num_total * sizeof(gint));
--		
--		for (i = 0; i < num_total; i++)
--			{
--			if (i < num_ordered)
--				new_order[i] = num_prepended + i;
--			else
--				new_order[i] = num_total - 1 - i;
--			}
--		gtk_tree_store_reorder(store, parent_iter, new_order);
--
--		g_free(new_order);
--		}
- }
- 
- void vflist_sort_set(ViewFile *vf, SortType type, gboolean ascend)
diff --git a/media-gfx/geeqie/files/geeqie-1.1-fix_comment_update.patch b/media-gfx/geeqie/files/geeqie-1.1-fix_comment_update.patch
deleted file mode 100644
index 42ef9ff40901..000000000000
--- a/media-gfx/geeqie/files/geeqie-1.1-fix_comment_update.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 085be43cb79e04341102a9922e0e0f531454089a Mon Sep 17 00:00:00 2001
-From: Vladimir Nadvornik <nadvornik@suse.cz>
-Date: Tue, 21 Aug 2012 20:39:03 +0200
-Subject: [PATCH] fixed updating of comment and keyword pane
-
-- temporary disabling of notifications does no longer work because
-the notification is called later, in idle cb.
-- regression introduced in 78cde6934008f79fe498e4adc64d187b0ed47417
-- now the update function checks if the new value is really different
----
- src/bar_comment.c  |   20 ++++++++++++--------
- src/bar_keywords.c |   37 +++++++++++++++++++++++--------------
- 2 files changed, 35 insertions(+), 22 deletions(-)
-
-diff --git a/src/bar_comment.c b/src/bar_comment.c
-index e63695b..156ab6e 100644
---- a/src/bar_comment.c
-+++ b/src/bar_comment.c
-@@ -60,16 +60,22 @@ static void bar_pane_comment_write(PaneCommentData *pcd)
- static void bar_pane_comment_update(PaneCommentData *pcd)
- {
- 	gchar *comment = NULL;
-+	gchar *orig_comment = NULL;
-+	gchar *comment_not_null;
- 	GtkTextBuffer *comment_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(pcd->comment_view));
- 
--	g_signal_handlers_block_by_func(comment_buffer, bar_pane_comment_changed, pcd);
--
-+	orig_comment = text_widget_text_pull(pcd->comment_view);
- 	comment = metadata_read_string(pcd->fd, pcd->key, METADATA_PLAIN);
--	gtk_text_buffer_set_text(comment_buffer,
--				 (comment) ? comment : "", -1);
--	g_free(comment);
-+	comment_not_null = (comment) ? comment : "";
- 	
--	g_signal_handlers_unblock_by_func(comment_buffer, bar_pane_comment_changed, pcd);
-+	if (strcmp(orig_comment, comment_not_null) != 0)
-+		{
-+		g_signal_handlers_block_by_func(comment_buffer, bar_pane_comment_changed, pcd);
-+		gtk_text_buffer_set_text(comment_buffer, comment_not_null, -1);
-+		g_signal_handlers_unblock_by_func(comment_buffer, bar_pane_comment_changed, pcd);
-+		}
-+	g_free(comment);
-+	g_free(orig_comment);
- 
- 	gtk_widget_set_sensitive(pcd->comment_view, (pcd->fd != NULL));
- }
-@@ -177,9 +183,7 @@ static void bar_pane_comment_changed(GtkTextBuffer *buffer, gpointer data)
- {
- 	PaneCommentData *pcd = data;
- 
--	file_data_unregister_notify_func(bar_pane_comment_notify_cb, pcd);
- 	bar_pane_comment_write(pcd);
--	file_data_register_notify_func(bar_pane_comment_notify_cb, pcd, NOTIFY_PRIORITY_LOW);
- }
- 
- 
-diff --git a/src/bar_keywords.c b/src/bar_keywords.c
-index df70fda..257915e 100644
---- a/src/bar_keywords.c
-+++ b/src/bar_keywords.c
-@@ -216,17 +216,33 @@ static void bar_pane_keywords_keyword_update_all(void)
- static void bar_pane_keywords_update(PaneKeywordsData *pkd)
- {
- 	GList *keywords = NULL;
-+	GList *orig_keywords = NULL;
-+	GList *work1, *work2;
- 	GtkTextBuffer *keyword_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(pkd->keyword_view));
- 
--	g_signal_handlers_block_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
--
- 	keywords = metadata_read_list(pkd->fd, KEYWORD_KEY, METADATA_PLAIN);
--	keyword_list_push(pkd->keyword_view, keywords);
--	bar_keyword_tree_sync(pkd);
--	string_list_free(keywords);
--	
--	g_signal_handlers_unblock_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
-+	orig_keywords = keyword_list_pull(pkd->keyword_view);
- 
-+	/* compare the lists */
-+	work1 = keywords;
-+	work2 = orig_keywords;
-+	
-+	while (work1 && work2)
-+		{
-+		if (strcmp(work1->data, work2->data) != 0) break;
-+		work1 = work1->next;
-+		work2 = work2->next;
-+		}
-+	
-+	if (work1 || work2) /* lists differs */
-+		{
-+		g_signal_handlers_block_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
-+		keyword_list_push(pkd->keyword_view, keywords);
-+		bar_keyword_tree_sync(pkd);
-+		g_signal_handlers_unblock_by_func(keyword_buffer, bar_pane_keywords_changed, pkd);
-+		}
-+	string_list_free(keywords);
-+	string_list_free(orig_keywords);
- }
- 
- void bar_pane_keywords_set_fd(GtkWidget *pane, FileData *fd)
-@@ -426,10 +442,8 @@ static gboolean bar_pane_keywords_changed_idle_cb(gpointer data)
- {
- 	PaneKeywordsData *pkd = data;
- 
--	file_data_unregister_notify_func(bar_pane_keywords_notify_cb, pkd);
- 	bar_pane_keywords_write(pkd);
- 	bar_keyword_tree_sync(pkd);
--	file_data_register_notify_func(bar_pane_keywords_notify_cb, pkd, NOTIFY_PRIORITY_LOW);
- 	pkd->idle_id = 0;
- 	return FALSE;
- }
-@@ -962,12 +976,7 @@ static void bar_pane_keywords_connect_mark_cb(GtkWidget *menu_widget, gpointer d
- 
- 	gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(model), &kw_iter, &iter);
- 
--	file_data_unregister_notify_func(bar_pane_keywords_notify_cb, pkd);
--
- 	meta_data_connect_mark_with_keyword(keyword_tree, &kw_iter, mark);
--
--	file_data_register_notify_func(bar_pane_keywords_notify_cb, pkd, NOTIFY_PRIORITY_LOW);
--//	bar_pane_keywords_update(pkd);
- }
- 
- 
--- 
-1.7.10
-
diff --git a/media-gfx/geeqie/geeqie-1.0-r4.ebuild b/media-gfx/geeqie/geeqie-1.0-r4.ebuild
deleted file mode 100644
index 9e2475a95f23..000000000000
--- a/media-gfx/geeqie/geeqie-1.0-r4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.0-r4.ebuild,v 1.4 2014/10/26 21:55:20 voyageur Exp $
-
-EAPI=4
-inherit autotools base eutils
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://geeqie.sourceforge.net/"
-SRC_URI="mirror://sourceforge/geeqie/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc exif lirc xmp"
-
-RDEPEND="x11-libs/gtk+:2
-	virtual/libintl
-	doc? ( app-text/gnome-doc-utils )
-	lirc? ( app-misc/lirc )
-	xmp? ( >=media-gfx/exiv2-0.17[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-automake-1.11.patch
-	"${FILESDIR}"/${P}-copy_chown.patch
-	"${FILESDIR}"/${P}-filedata_compare.patch
-	"${FILESDIR}"/${P}-fix_fullscreen.patch
-	"${FILESDIR}"/${P}-lfs_support.patch
-	"${FILESDIR}"/${P}-ui_pathsel.patch
-	"${FILESDIR}"/${P}-vflist-refresh.patch
-	"${FILESDIR}"/${P}-up_path_restore.patch
-)
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--disable-dependency-tracking
-		--with-readmedir=/usr/share/doc/${PF}
-		--disable-lcms
-		$(use_enable lirc)"
-
-	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/${MY_P}/COPYING"
-}
-
-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.1.ebuild b/media-gfx/geeqie/geeqie-1.1.ebuild
deleted file mode 100644
index 9ffec1d69e12..000000000000
--- a/media-gfx/geeqie/geeqie-1.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.1.ebuild,v 1.2 2014/10/26 21:55:20 voyageur Exp $
-
-EAPI=4
-inherit autotools base eutils
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://geeqie.sourceforge.net/"
-SRC_URI="mirror://sourceforge/geeqie/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc exif lirc xmp"
-
-RDEPEND="x11-libs/gtk+:2
-	virtual/libintl
-	doc? ( app-text/gnome-doc-utils )
-	lirc? ( app-misc/lirc )
-	xmp? ( >=media-gfx/exiv2-0.17[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-automake-1.11.patch
-	"${FILESDIR}"/${PN}-1.0-fix_fullscreen.patch
-	"${FILESDIR}"/${P}-fix_comment_update.patch
-)
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--disable-dependency-tracking
-		--with-readmedir=/usr/share/doc/${PF}
-		--disable-lcms
-		$(use_enable lirc)"
-
-	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/${MY_P}/COPYING"
-}
-
-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-r1.ebuild b/media-gfx/geeqie/geeqie-1.2-r1.ebuild
index 0ff0673433d0..f8eb22c83d96 100644
--- a/media-gfx/geeqie/geeqie-1.2-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.2-r1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.2-r1.ebuild,v 1.4 2015/01/26 10:43:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/geeqie/geeqie-1.2-r1.ebuild,v 1.5 2015/05/29 15:41:50 voyageur Exp $
 
 EAPI=5
 inherit autotools base eutils
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://geeqie.sourceforge.net/"
-SRC_URI="https://gitorious.org/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://www.geeqie.org"
+# Grab from tag snapshot: http://www.geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git
+SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,7 +21,7 @@ RDEPEND="x11-libs/gtk+:2
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
 	lirc? ( app-misc/lirc )
-	lua? ( >=dev-lang/lua-5.1 )
+	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 )"