Drop old

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

7 files changed, 25 insertions, 537 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index bbb3380d40b5..5b3e6f444707 100644
--- a/media-gfx/shotwell/ChangeLog
+++ b/media-gfx/shotwell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/shotwell
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.84 2015/07/11 19:17:56 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.85 2015/07/28 14:26:38 jlec Exp $
+
+  28 Jul 2015; Justin Lecher <jlec@gentoo.org>
+  -files/shotwell-0.13.1-gst-1.0.patch, -files/shotwell-0.14.1-libraw.patch,
+  -files/shotwell-0.15.1-format-security.patch, -shotwell-0.20.1-r1.ebuild,
+  -shotwell-0.21.0.ebuild:
+  Drop old
 
   11 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> shotwell-0.22.0.ebuild:
   x86 stable wrt bug #532272
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 922da0a43f75..bfde16f71869 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,26 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX shotwell-0.13.1-gst-1.0.patch 10251 SHA256 6f8ba6762f9e6d353881896b61a9ef2a6abe3956e2efd9c23dd58027cf9893c4 SHA512 0bd436765d4e77f65ff452853fd722e6da74ec67a226e68c698b3e3b7756dfacfb917713d324df6f4f79fee28c07b0439b70f394e479fa2600393e2d1030c324 WHIRLPOOL c6ba5930c7c9ccf874d59bc59f1567602b0c81cfdb384d8f2343813c2e93aca72333d220bd8559a087df83ea96a0ea5e2b4b3e45eaebf6ff7650bad4421a8083
 AUX shotwell-0.13.1-ldflags.patch 1142 SHA256 d7fe75551807d7998c9494c9c065c611f98dbfd8db2b09bed8a1430048063b12 SHA512 036a99134afb69ab8f7ded853aec427f5c3289cab753c1796be71e75544ae18fdd628a82c628c1f6939c852c6abaf3b2841b4155fdb4831a8c091bdc5761d5c3 WHIRLPOOL 088c4fa519c32d36f663411468daa0b5547855d3d744f148282ea86c5743a4601669f2b82a9d5581a1dc34dfce3b001ee55810a96515e1db6316985857a1ed3b
-AUX shotwell-0.14.1-libraw.patch 1896 SHA256 f6bb9be6b5b03adcc2aab4d8cf1d7cdc564efec1ccd012283740ef3fd9f7d959 SHA512 bd0cfffefe61d46c341f97564e98fe7af306a345765098ec7410eec86e2985f00b355e13fcb2824051a371876705ef30a1f0ef862293725f6c2764cd19f86649 WHIRLPOOL fbab77a21df7c5689c1c8840b8a1f8a9d5694a9f0cb0c1fd712e0a2259db95ba701c3aa382a15ed6765a3b1a1edbc865f034cfc2c18066835e847f815e88d1b9
-AUX shotwell-0.15.1-format-security.patch 647 SHA256 56493144c5717cb98b319a6512a6a7770ef33dc67adf15ad3fc92fa06840b320 SHA512 45f192adde97d3b7445b969839438fb8f8b2f96325cde30d37948f86625d49353494139add14637abcd16503b4d53d2ef88b5d8f3c19dbc8068021ee1a418eb5 WHIRLPOOL 80cc6bbd54b0bf273030be2bee4790259955e98b6d5d2fc22bb7c90e195bec78e89aa7745e6c11f861b63ac5ef892fcd23f5c181efa310a8b3a517fc7a0578ef
-DIST shotwell-0.20.1.tar.xz 1810488 SHA256 86a869432b7c049e61217ad09eeac7e0d79cabfeca04a57a3629ad25f3070615 SHA512 4c72f648b2778e38b6748b79398481f7d05d4c68c08c3537c4bb0c045f4a7da44f9724bfdd7a612a3c246d936f3d365fd951a4b599ef59eb19ddf94f88beedff WHIRLPOOL 1c088307c5b7e9f6f202a6f4864c2226b86e5d411f77e473275d2f2c774de319c2eddb63604aba445b81e9c5c12872b6a9733aad22ff8cde9c2a06c0e0a84a4e
-DIST shotwell-0.21.0.tar.xz 1839240 SHA256 7764b393987a0a4e82203bfb0c57e8f2f0f7f04110a3339ec650fc705f9feb64 SHA512 4bf8d10c5a5a1e65a17429ca7939cf223c9c9d3b347a7fdc7c16ea800133fe600bbd354c9fbe9dcc083bbab3167519b71b088efcaa66849f0668c762f98ae2e1 WHIRLPOOL ed3ab11144acba65a38d712641522bede3c0dbee9f9d7109e89862638c9ce13267728d2ce01158c3729d8250518a307e717c4eaf9d45364ccfb69cd6f4d26d2b
 DIST shotwell-0.22.0.tar.xz 1872952 SHA256 01b192c5c1c188ecd11bfdb6143d8f177f313c7eab7fe320bd20ac3ca352f831 SHA512 486f27a1fa06512a925ecae60504f3cbc487d44834f635efd0897dd20cb304a731c08133ab4b04b32a754235fc8c63dc9b05787b1a0c72a98c89ca91c64f452c WHIRLPOOL 8b93b6a92822c26aa7962f30e7402322371db1e6d297d7cd4e612f01f0418bcf2ee3598954e7d2a59d62f7e9704479bb24cb6fcf4263ab5315668c20543445c3
 DIST shotwell-icons.tar.bz2 59644 SHA256 aaf4e1a03ba2d17edb24f1c35bc880573a6066dfa1b2223526a4521cc213acec SHA512 0b2beb845841c7b1a8535742ce68026c21972abee6c02f904c02549ca2af5455d81a48c5344748bb83915e8b7fd4f17f93f6af637de512e6aff91d9b0eb3cff0 WHIRLPOOL 5bb2c13c6a1e5f8c6a1c666d20126474476a97a56f4e70e2c14a0d5281bb310815946db6e6322d3bfe6db8374981823d9bd32e76f3776b9eb9a62a9c1c7d0785
 DIST shotwell.1 1238 SHA256 7f4036f14a6c599835bd121d63705ddc766388aae8c6414eb3a405c85b9a5014 SHA512 8090d5d339a44992d2543ba9ed1bb6e0eb18da8d3fe6ad4f95f917d3aca352e6af0b8c21a7da3a8be9aa1cb04a13e8602d9db8484d4801547cfadc6c40500ad4 WHIRLPOOL cb3c1ef3cb6a577fa94d0aec4dfc06ee84a1f77771268e3217704fed269cd0cd3c220a4e68d270c152b34dc2e438e193d47aee87dd891a39fd8236a6d269eb3b
-EBUILD shotwell-0.20.1-r1.ebuild 2869 SHA256 36747749ad1e1bea7988c05f99c27faa9552a7442083a0f3dad81111e9397edd SHA512 301e69756d72e251b518edec3933fcd1e1665640d53445a39789c870a9f47f65385535137947a58393f448874d7bd87c1bec1fc7b2946088aaf081bc3db12226 WHIRLPOOL 1abc7d10649bb076bdf965a5294db0f91ce61f37f24e480a6f88ea73f6a3ec618df3a0b3934df98690d994409ca042addf08833fd74ccb6ba74fdf7b2baf8003
-EBUILD shotwell-0.21.0.ebuild 2880 SHA256 58eac6df5fc730b0bf627c64b54a08c9c031d710b482a4e59330394a0f54fed4 SHA512 78adb8a80b195be4c4a9a4b924ac5a10d2d5126281e60596f335b72d6a0c2d5437f9f20411c0320b4729f6bcc7b631427fe83a57d9acac24e71c1b7f6282f037 WHIRLPOOL a43728000a484aa21fadca5157c4c896cf957fc13d8fee2af647ff09ced137147962965465a96c5afe421da9bb8d74251f509d82183a00bf49708e7230c09d34
 EBUILD shotwell-0.22.0.ebuild 2881 SHA256 401642e10ff4a9b983c9345e8b30c07a437a2338afcc87a89c12b225d4affb43 SHA512 a6539455f5b016b72ac2caeb2a5b07f24aa09e77229a5009eab58fc96933384ad60da6ed1bc50cd39f729dadfc97f54938228ddbdee6dd14b84aa884af7a50bf WHIRLPOOL 75a37f2f1447cd3bb75904e22964739a7a799c07215f07a4b9a63bcd26b1c1f431758a85b68457837c06c76abfc30c87a876b69f710d8329b4b59003ef5d0da7
-MISC ChangeLog 12913 SHA256 5df662fe33d8db0ad381cfc0986f2d042d61aef9d32c9cac4bc8af983bbe3871 SHA512 ab10148adc269201a7a5dafa9b67fca88f0598313849f192d6dd300acce77cf0b9d875b6952e5b878ddddc5feb86dbc5f98a4814758e1a50a7b88b9d8da614b8 WHIRLPOOL 75f06bed29871b045a7331bda3c42cb050ee89bc67e857b14dabca033698c786175a0193d8b79c5defaeeb963490056089e5b908490bf447b151e3fc2d98f587
+MISC ChangeLog 13149 SHA256 0b668b615c618f17e7eb199ce770c1fcbcb48b6aab0a083be255d95574ed978f SHA512 fef2294c2b0339c44f9e5e54c7e9ca0003f11922d7693a9b1f783cf563419e09b93bfdcab2ea6d9da4cdfcbd83c0ad6c9100798657608b2f5586da9e576e4d83 WHIRLPOOL 7af1af49b2749c05649539f210beb19984b509c6306c47b6ce5115e15df7b6a1da94a0aed9dc6b1a99eb2b970791e1af9b3a2157d76939906ce6b3d80aa27bd6
 MISC metadata.xml 665 SHA256 d7ed9e0a0af566d5e6891e77c0b69c49df16b5d291f0126243892a3ec36aaedf SHA512 4bc0078d47452551bc043e9fb6d1774db44b9b2cf67ee581e9cdeeffb86b198c13753c7595638e1feedc9c876457d1d5393d064d6535f1b2283bcec43c861300 WHIRLPOOL e3bd5f1dc118225520d15e289e901c686478707b39e4aff702ae0d33ad7005f158874686d7d49ce2e5f18faeb920e612a109c0c9e6f4bd737a24b58578e7c088
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iJwEAQEIAAYFAlWha14ACgkQG9wOWsQutda22AP/VkVVP3aeS5fTCXybrj6bH8Gv
-KZqTx5rkKa9SrtROKhqVuRNoRPM/dzMr7nVWAjppw4T275wPZQeGGqt4TVo0J+Ff
-9fZdm7VuxDzj4bYmgM5qFlPvzi1niNnNEk1A/qxq3bdspeIEyEkJxtCQ3aMwmhFF
-v3BYrsa0HxOKQIqCoeQ=
-=zf/E
+iQJ8BAEBCgBmBQJVt5EYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiiJMP/jbfGnW3zbM95fKo8W+ZFBOb
+6khEgSQstIH89KRjWNz10aP25SSCXFrTxHVQxVVuhJoG/MAiv14Gq76TEm2A+wc9
+8a0//YGkMot2FjCD3dj8rXVBueZHMcu31alJkePuoyzZ/Bxr4xXvjMSJIT3vPI9Q
+seVqLGdg6b9oJB2inIXNW7GHEWvAv6n25ybN9GEkFy+n/XeXOm0KSzKnE8vjX+Cb
+H3Nyy1DxMJJRdB34mPa0drBec70+P4FSzMz7Q6DBsrJxXgEQy8InFPuDMqVUhr3i
+mqYIEBrBEF3urFCfXxB9UEzCEeObAqEa+bwLcEixwP2mB/7OM2LIAVNqTbq64O8M
+0aUY67cBHCRw70DGiW7kjftGlKtUY3heUSNI9VVy2zeB93wvPmzoB9f2QFpNKubd
+gSg8qwlGovUmnhUvYeJTq8GokBldOXNPatfAyGn0I7tFgR45kSU2ferYlTgXSywU
+f7WHCcnDjztII+v9L4DAz7/jTrisNsFrBcyvr8P2TDCg0RlJnNk6u37zHkji5nBl
+0VDBz4OoHUmFYqFbD9i1dzqf5gJ2ntv8DbIHAex0/wdK8XBEKHpNKunY1g7lq9Oh
+QkUGy9h+bszpM0XaJqiaEIyPQGlE+Xmh+FBck+LMCEHUbZQnSkmoOcqTbpCl5pzH
+cruIY5AItCzyMFVHgR2u
+=2ZSz
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/shotwell/files/shotwell-0.13.1-gst-1.0.patch b/media-gfx/shotwell/files/shotwell-0.13.1-gst-1.0.patch
deleted file mode 100644
index 82a4f39e1f86..000000000000
--- a/media-gfx/shotwell/files/shotwell-0.13.1-gst-1.0.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-From 4db67e385c9c2d89947077f1520aa31af2538d65 Mon Sep 17 00:00:00 2001
-Message-Id: <4db67e385c9c2d89947077f1520aa31af2538d65.1358017927.git.jlec@gentoo.org>
-From: Alban Browaeys <prahal@yahoo.com>
-Date: Tue, 8 Jan 2013 17:11:27 -0800
-Subject: [PATCH] Ports Shotwell to GStreamer 1.0. Closes #6055.
-
----
- Makefile                                    | 22 +++++-----
- THANKS                                      |  1 +
- debian/control                              |  6 +--
- src/VideoSupport.vala                       |  8 ++--
- thumbnailer/shotwell-video-thumbnailer.vala | 65 ++++++++++++++++-------------
- 5 files changed, 56 insertions(+), 46 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2488f82..5a7e262 100644
---- a/Makefile
-+++ b/Makefile
-@@ -37,7 +37,7 @@ EXTRAS_SUPPORTED_LANGUAGES=fr de it es pl et sv sk lv pt bg bn nl da zh_CN el ru
- LOCAL_LANG_DIR=locale-langpack
- SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale
- 
--VALAFLAGS := -g --enable-checking --thread --fatal-warnings --enable-deprecated $(USER_VALAFLAGS)
-+VALAFLAGS := -g --enable-checking --thread --fatal-warnings --enable-deprecated --enable-experimental $(USER_VALAFLAGS)
- ifdef UNITY_SUPPORT
- VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT
- endif
-@@ -293,9 +293,9 @@ EXT_PKGS = \
- 	gio-unix-2.0 \
- 	glib-2.0 \
- 	gmodule-2.0 \
--	gstreamer-0.10 \
--	gstreamer-base-0.10 \
--	gstreamer-pbutils-0.10 \
-+	gstreamer-1.0 \
-+	gstreamer-base-1.0 \
-+	gstreamer-pbutils-1.0 \
- 	gtk+-3.0 \
- 	gudev-1.0 \
- 	libexif \
-@@ -314,8 +314,8 @@ endif
- THUMBNAILER_PKGS = \
-     gtk+-3.0 \
-     gee-1.0 \
--    gstreamer-0.10 \
--    gstreamer-base-0.10
-+    gstreamer-1.0 \
-+    gstreamer-base-1.0
- 
- DIRECT_LIBS =
- 
-@@ -325,10 +325,10 @@ EXT_PKG_VERSIONS = \
- 	gio-unix-2.0 >= 2.20 \
- 	glib-2.0 >= $(MIN_GLIB_VERSION) \
- 	gmodule-2.0 >= 2.24.0 \
--	gstreamer-0.10 >= 0.10.28 \
--	gstreamer-base-0.10 >= 0.10.28 \
--	gstreamer-plugins-base-0.10 >= 0.10.32 \
--	gstreamer-pbutils-0.10 >= 0.10.32 \
-+	gstreamer-1.0 >= 1.0.0 \
-+	gstreamer-base-1.0 >= 1.0.0 \
-+	gstreamer-plugins-base-1.0 >= 1.0.0 \
-+	gstreamer-pbutils-1.0 >= 1.0.0 \
- 	gtk+-3.0 >= 3.0.11 \
- 	gudev-1.0 >= 145 \
- 	libexif >= 0.6.16 \
-@@ -683,7 +683,7 @@ $(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(GPHOTO_VAPI_FILE)
- 	$(call check_valac_version)
- 	@echo Compiling Vala code...
- 	@mkdir -p $(BUILD_DIR)
--	@$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \
-+	$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \
- 		$(foreach pkg,$(VALA_PKGS),--pkg=$(pkg)) \
- 		$(foreach vapidir,$(VAPI_DIRS),--vapidir=$(vapidir)) \
- 		$(foreach def,$(DEFINES),-X -D$(def)) \
-diff --git a/src/VideoSupport.vala b/src/VideoSupport.vala
-index deb45e2..f679bd0 100644
---- a/src/VideoSupport.vala
-+++ b/src/VideoSupport.vala
-@@ -163,8 +163,8 @@ public class VideoReader {
-                 file.get_path()));
-         
-         try {
--            Gst.Discoverer d = new Gst.Discoverer((Gst.ClockTime) (Gst.SECOND * 5));
--            Gst.DiscovererInfo info = d.discover_uri(file.get_uri());
-+            Gst.PbUtils.Discoverer d = new Gst.PbUtils.Discoverer((Gst.ClockTime) (Gst.SECOND * 5));
-+            Gst.PbUtils.DiscovererInfo info = d.discover_uri(file.get_uri());
-             
-             clip_duration = ((double) info.get_duration()) / 1000000000.0;
-             
-@@ -172,7 +172,7 @@ public class VideoReader {
-             // TODO: Note that TAG_DATE can be changed to TAG_DATE_TIME in the future
-             // (and the corresponding output struct) in order to implement #2836.
-             Date? video_date = null;
--            if (info.get_tags() != null && info.get_tags().get_date(Gst.TAG_DATE, out video_date)) {
-+            if (info.get_tags() != null && info.get_tags().get_date(Gst.Tags.DATE, out video_date)) {
-                 timestamp = new DateTime.local(video_date.get_year(), video_date.get_month(), 
-                     video_date.get_day(), 0, 0, 0);
-             }
-@@ -323,7 +323,7 @@ public class Video : VideoSource, Flaggable, Monitorable, Dateable {
-         Gst.init(ref fake_unowned_args);
-         
-         int saved_state = Config.Facade.get_instance().get_video_interpreter_state_cookie();
--        current_state = (int) Gst.Registry.get_default().get_feature_list_cookie();
-+        current_state = (int) Gst.Registry.get().get_feature_list_cookie();
-         if (saved_state == Config.Facade.NO_VIDEO_INTERPRETER_STATE) {
-             message("interpreter state cookie not found; assuming all video thumbnails are out of date");
-             interpreter_state_changed = true;
-diff --git a/thumbnailer/shotwell-video-thumbnailer.vala b/thumbnailer/shotwell-video-thumbnailer.vala
-index 79a2d7e..ae1e537 100644
---- a/thumbnailer/shotwell-video-thumbnailer.vala
-+++ b/thumbnailer/shotwell-video-thumbnailer.vala
-@@ -10,22 +10,15 @@
- // Shotwell Thumbnailer takes in a video file and returns a thumbnail to stdout.  This is
- // a replacement for totem-video-thumbnailer
- class ShotwellThumbnailer {
--    const string caps_string = """video/x-raw-rgb,bpp = (int) 32, depth = (int) 32,
--                                      endianness = (int) BIG_ENDIAN,
--                                      red_mask = (int)   0xFF000000,
--                                      green_mask = (int) 0x00FF0000,
--                                      blue_mask = (int)  0x0000FF00,
--                                      width = (int) [ 1, max ],
--                                      height = (int) [ 1, max ],
--                                      framerate = (fraction) [ 0, max ]""";
-+    const string caps_string = """video/x-raw,format=RGB,bpp=32,depth=32,pixel-aspect-ratio=1/1""";
-     
-     public static int main(string[] args) {
-         Gst.Element pipeline, sink;
-         int width, height;
--        Gst.Buffer buffer;
-+        Gst.Sample sample;
-         string descr;
-         Gdk.Pixbuf pixbuf;
--        int64 position;
-+        int64 duration, position;
-         Gst.StateChangeReturn ret;
-         bool res;
-         
-@@ -36,7 +29,7 @@ class ShotwellThumbnailer {
-             return 1;
-         }
-         
--        descr = "filesrc location=\"%s\" ! decodebin2 ! ffmpegcolorspace ! ".printf(args[1]) + 
-+        descr = "filesrc location=\"%s\" ! decodebin ! videoconvert ! videoscale ! ".printf(args[1]) +
-             "appsink name=sink caps=\"%s\"".printf(caps_string);
-         
-         try {
-@@ -64,29 +57,41 @@ class ShotwellThumbnailer {
-                 stderr.printf("Failed to play the file: couldn't get state.\n");
-                 return 3;
-             }
--            
--            // Seek to the a position in the file. Most files have a black first frame so
--            // by seeking to somewhere else we have a bigger chance of getting something
--            // more interesting. An optimization would be to detect black images and then
--            // seek a little more.
--            position = (int64) (Gst.Format.PERCENT_MAX * 0.05);
--            pipeline.seek_simple(Gst.Format.PERCENT, Gst.SeekFlags.KEY_UNIT | Gst.SeekFlags.FLUSH , position);
--            
--            // Get the preroll buffer from appsink, this block untils appsink really
--            // prerolls.
--            GLib.Signal.emit_by_name(sink, "pull-preroll", out buffer, null);
--            
-+
-+            /* get the duration */
-+            pipeline.query_duration (Gst.Format.TIME, out duration);
-+
-+            if (duration != -1) {
-+                /* we have a duration, seek to 5% */
-+                position = duration * 5 / 100;
-+            } else {
-+                /* no duration, seek to 1 second, this could EOS */
-+                position = 1 * Gst.SECOND;
-+            }
-+
-+            /* seek to the a position in the file. Most files have a black first frame so
-+             * by seeking to somewhere else we have a bigger chance of getting something
-+             * more interesting. An optimisation would be to detect black images and then
-+             * seek a little more */
-+            pipeline.seek_simple (Gst.Format.TIME, Gst.SeekFlags.KEY_UNIT | Gst.SeekFlags.FLUSH, position);
-+
-+            /* get the preroll buffer from appsink, this block untils appsink really
-+             * prerolls */
-+            GLib.Signal.emit_by_name (sink, "pull-preroll", out sample, null);
-+
-             // if we have a buffer now, convert it to a pixbuf. It's possible that we
-             // don't have a buffer because we went EOS right away or had an error.
--            if (buffer != null) {
-+            if (sample != null) {
-+                Gst.Buffer buffer;
-                 Gst.Caps caps;
-                 Gst.Structure s;
-+                Gst.MapInfo mapinfo;
- 
-                 // Get the snapshot buffer format now. We set the caps on the appsink so
-                 // that it can only be an rgb buffer. The only thing we have not specified
-                 // on the caps is the height, which is dependant on the pixel-aspect-ratio
-                 // of the source material.
--                caps = buffer.get_caps();
-+                caps = sample.get_caps();
-                 if (caps == null) {
-                     stderr.printf("could not get snapshot format\n");
-                     return 5;
-@@ -101,14 +106,18 @@ class ShotwellThumbnailer {
-                     stderr.printf("Could not get snapshot dimension\n");
-                     return 6;
-                 }
--                
-+
-+                buffer = sample.get_buffer();
-+                buffer.map(out mapinfo, Gst.MapFlags.READ);
-+
-                 // Create pixmap from buffer and save, gstreamer video buffers have a stride
-                 // that is rounded up to the nearest multiple of 4.
--                pixbuf = new Gdk.Pixbuf.from_data(buffer.data, Gdk.Colorspace.RGB, true, 8, 
--                    width, height, width * 4, null);
-+                pixbuf = new Gdk.Pixbuf.from_data(mapinfo.data, Gdk.Colorspace.RGB, false, 8,
-+                    width, height, (((width * 3)+3)&~3), null);
-                 
-                 // Save the pixbuf.
-                 pixbuf.save("/dev/stdout", "png");
-+                buffer.unmap(mapinfo);
-             } else {
-                 stderr.printf("Could not make snapshot\n");
-                 return 10;
--- 
-1.8.1
-
diff --git a/media-gfx/shotwell/files/shotwell-0.14.1-libraw.patch b/media-gfx/shotwell/files/shotwell-0.14.1-libraw.patch
deleted file mode 100644
index de60afe6accd..000000000000
--- a/media-gfx/shotwell/files/shotwell-0.14.1-libraw.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-commit 89aa167726d12f9ae0b53c01a2fdc54601fc3cc5
-Author: Jim Nelson <jim@yorba.org>
-Date:   Wed May 29 11:52:09 2013 -0700
-
-    Build with LibRaw 0.15: Closes #7012
-    
-    LibRaw 0.15 removed document-mode processing, which, as their release
-    notes say, "no one uses".  Compile error were nothing more than
-    missing symbols -- Shotwell wasn't using it either.
-
-diff --git a/src/photos/GRaw.vala b/src/photos/GRaw.vala
-index f57886e..b7c3922 100644
---- a/src/photos/GRaw.vala
-+++ b/src/photos/GRaw.vala
-@@ -21,12 +21,6 @@ public enum Colorspace {
-     XYZ = 5
- }
- 
--public enum DocMode {
--    STANDARD = 0,
--    GRAYSCALE = 1,
--    GRAYSCALE_NO_WHITE_BALANCE = 2
--}
--
- public errordomain Exception {
-     UNSPECIFIED,
-     UNSUPPORTED_FILE,
-@@ -167,10 +161,6 @@ public class Processor {
-         throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only());
-     }
-     
--    public void document_mode_processing() throws Exception {
--        throw_exception("document_mode_processing", proc.document_mode_processing());
--    }
--    
-     public unowned LibRaw.ImageOther get_image_other() {
-         return proc.get_image_other();
-     }
-@@ -244,7 +234,6 @@ public class Processor {
-         // threshold
-         output_params->half_size = half_size;
-         // four_color_rgb
--        output_params->document_mode = GRaw.DocMode.STANDARD;
-         output_params->highlight = GRaw.HighlightMode.CLIP;
-         output_params->use_auto_wb = true;
-         output_params->use_camera_wb = true;
-diff --git a/vapi/libraw.vapi b/vapi/libraw.vapi
-index 05de461..a8a0a4d 100644
---- a/vapi/libraw.vapi
-+++ b/vapi/libraw.vapi
-@@ -104,7 +104,6 @@ public struct OutputParams {
-     public float threshold;
-     public bool half_size;
-     public bool four_color_rgb;
--    public int document_mode;
-     public int highlight;
-     public bool use_auto_wb;
-     public bool use_camera_wb;
diff --git a/media-gfx/shotwell/files/shotwell-0.15.1-format-security.patch b/media-gfx/shotwell/files/shotwell-0.15.1-format-security.patch
deleted file mode 100644
index a4ad89b7a31d..000000000000
--- a/media-gfx/shotwell/files/shotwell-0.15.1-format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Dialogs.vala
-+++ src/Dialogs.vala
-@@ -31,7 +31,7 @@
- 
- public bool confirm_warn_developer_changed(int number) {
-     Gtk.MessageDialog dialog = new Gtk.MessageDialog.with_markup(AppWindow.get_instance(),
--        Gtk.DialogFlags.MODAL, Gtk.MessageType.WARNING, Gtk.ButtonsType.NONE,
-+        Gtk.DialogFlags.MODAL, Gtk.MessageType.WARNING, Gtk.ButtonsType.NONE, "%s",
-         "<span weight=\"bold\" size=\"larger\">%s</span>".printf(ngettext("Switching developers will undo all changes you have made to this photo in Shotwell",
-         "Switching developers will undo all changes you have made to these photos in Shotwell", number)));
- 
diff --git a/media-gfx/shotwell/shotwell-0.20.1-r1.ebuild b/media-gfx/shotwell/shotwell-0.20.1-r1.ebuild
deleted file mode 100644
index fa0232122b03..000000000000
--- a/media-gfx/shotwell/shotwell-0.20.1-r1.ebuild
+++ /dev/null
@@ -1,112 +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/shotwell/shotwell-0.20.1-r1.ebuild,v 1.3 2014/12/05 10:19:00 ago Exp $
-
-EAPI=5
-
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.20"
-VALA_MAX_API_VERSION="0.24"
-
-inherit eutils gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="http://yorba.org/shotwell/"
-SRC_URI="
-	mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz
-	http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell.1
-	http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell-icons.tar.bz2
-	"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-CORE_SUPPORTED_LANGUAGES="
-	af ar as ast bg bn bn_IN ca cs da de el en_GB eo es et eu fi fr gd gl gu he
-	hi hr hu ia id it ja kk km kn ko ky lt lv mk ml mr nb nl nn or pa pl pt
-	pt_BR ro ru sk sl sr sv ta te th tr uk vi zh_CN zh_HK zh_TW"
-
-for x in ${CORE_SUPPORTED_LANGUAGES}; do
-	IUSE+="linguas_${x} "
-done
-
-RDEPEND="
-	app-text/gnome-doc-utils
-	>=dev-db/sqlite-3.5.9:3
-	>=dev-libs/dbus-glib-0.80
-	>=dev-libs/glib-2.30.0:2
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	>=dev-util/desktop-file-utils-0.13
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.4.90
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.4.2:=
-	>=media-libs/libraw-0.13.2:=
-	>=net-libs/libsoup-2.26.0:2.4
-	>=net-libs/rest-0.7:0.7
-	>=net-libs/webkit-gtk-1.4:3
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.6.0:3[X]"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=sys-devel/m4-1.4.13"
-
-DOCS=( AUTHORS MAINTAINERS NEWS README THANKS )
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-pkg_setup() {
-	tc-export CC
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--disable-desktop-update
-		--disable-icon-update
-		--prefix=/usr
-		--lib=$(get_libdir)"
-}
-
-src_prepare() {
-	vala_src_prepare
-	sed \
-		-e 's|CFLAGS :|CFLAGS +|g' \
-		-i plugins/Makefile.plugin.mk || die
-	epatch \
-		"${FILESDIR}"/${PN}-0.13.1-ldflags.patch
-}
-
-src_configure() {
-	./configure \
-		${G2CONF} \
-		|| die
-}
-
-src_compile() {
-	local valaver="$(vala_best_api_version)"
-	emake VALAC="$(type -p valac-${valaver})"
-}
-
-src_install() {
-	local res
-	gnome2_src_install
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			find "${D}"/usr/share/locale/${x} -type f -exec rm {} + || die
-		fi
-	done
-	doman "${DISTDIR}"/${PN}.1
-	for res in 16 22 24 32 48 256; do
-		doicon -s ${res} "${WORKDIR}"/${res}x${res}/*
-	done
-}
diff --git a/media-gfx/shotwell/shotwell-0.21.0.ebuild b/media-gfx/shotwell/shotwell-0.21.0.ebuild
deleted file mode 100644
index bac9fd486cfc..000000000000
--- a/media-gfx/shotwell/shotwell-0.21.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.21.0.ebuild,v 1.1 2015/02/22 11:37:25 jlec Exp $
-
-EAPI=5
-
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.26"
-VALA_MAX_API_VERSION="0.26"
-
-inherit eutils gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-SRC_URI="
-	mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz
-	http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell.1
-	http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell-icons.tar.bz2
-	"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-CORE_SUPPORTED_LANGUAGES="
-	af ar as ast bg bn bn_IN ca cs da de el en_GB eo es et eu fi fr gd gl gu he
-	hi hr hu ia id it ja kk km kn ko ky lt lv mk ml mr nb nl nn or pa pl pt
-	pt_BR ro ru sk sl sr sv ta te th tr uk vi zh_CN zh_HK zh_TW"
-
-for x in ${CORE_SUPPORTED_LANGUAGES}; do
-	IUSE+="linguas_${x} "
-done
-
-RDEPEND="
-	app-text/gnome-doc-utils
-	>=dev-db/sqlite-3.5.9:3
-	>=dev-libs/dbus-glib-0.80
-	>=dev-libs/glib-2.30.0:2
-	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	>=dev-util/desktop-file-utils-0.13
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.4.90
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.4.2:=
-	>=media-libs/libraw-0.13.2:=
-	>=net-libs/libsoup-2.26.0:2.4
-	>=net-libs/rest-0.7:0.7
-	>=net-libs/webkit-gtk-1.4:3
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.12.2:3[X]"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=sys-devel/m4-1.4.13"
-
-DOCS=( AUTHORS MAINTAINERS NEWS README THANKS )
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-pkg_setup() {
-	tc-export CC
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--disable-desktop-update
-		--disable-icon-update
-		--prefix=/usr
-		--lib=$(get_libdir)"
-}
-
-src_prepare() {
-	vala_src_prepare
-	sed \
-		-e 's|CFLAGS :|CFLAGS +|g' \
-		-i plugins/Makefile.plugin.mk || die
-	epatch \
-		"${FILESDIR}"/${PN}-0.13.1-ldflags.patch
-}
-
-src_configure() {
-	./configure \
-		${G2CONF} \
-		|| die
-}
-
-src_compile() {
-	local valaver="$(vala_best_api_version)"
-	emake VALAC="$(type -p valac-${valaver})"
-}
-
-src_install() {
-	local res
-	gnome2_src_install
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			find "${D}"/usr/share/locale/${x} -type f -exec rm {} + || die
-		fi
-	done
-	doman "${DISTDIR}"/${PN}.1
-	for res in 16 22 24 32 48 256; do
-		doicon -s ${res} "${WORKDIR}"/${res}x${res}/*
-	done
-}