summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin42090 -> 41918 bytes
-rw-r--r--media-gfx/engauge/Manifest2
-rw-r--r--media-gfx/engauge/engauge-10.6.ebuild93
-rw-r--r--media-gfx/fbgrab/Manifest4
-rw-r--r--media-gfx/fbgrab/fbgrab-1.0-r2.ebuild4
-rw-r--r--media-gfx/fbgrab/fbgrab-1.3.ebuild4
-rw-r--r--media-gfx/imagemagick/Manifest12
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild2
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild2
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.9.43.ebuild185
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild2
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild2
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.7.31.ebuild185
-rw-r--r--media-gfx/scantailor/Manifest3
-rw-r--r--media-gfx/scantailor/metadata.xml11
-rw-r--r--media-gfx/scantailor/scantailor-0.9.12.2.ebuild54
-rw-r--r--media-gfx/shotwell/Manifest2
-rw-r--r--media-gfx/shotwell/shotwell-0.28.3.ebuild63
-rw-r--r--media-gfx/zbar/Manifest6
-rw-r--r--media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch74
-rw-r--r--media-gfx/zbar/zbar-0.10-r6.ebuild72
-rw-r--r--media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild100
-rw-r--r--media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild (renamed from media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild)6
23 files changed, 551 insertions, 337 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index d606c02ac1de..60137676995c 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 28ce28ecdc06..9579a227e2f4 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,3 +1,5 @@
+DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
DIST engauge_5.2.tgz 5708224 BLAKE2B 65403f3eb322a3cfee2f04d3a973deef5196a475f594599e3226dad776505c639536fdc46ef94d955d94b0629faf9282378e7bb4d4d7945e0ae69cdd6160a858 SHA512 b1839a223c93866f880ca090b6dd5a9ab45a89b5f6f470fd6abba3e2aa4b108ed228c8b06c3888fa463316798c2d157e20b2e22975bd65a1124d007bb36d2d88
+EBUILD engauge-10.6.ebuild 2285 BLAKE2B 458d2526784e58cb6299bea5e0b92616fb496361fdd28ae2bbfd865562a8c87aad73b765c4de0849edf7a5950f267ec14f4c009b102a07f4a5b79672658d9c4f SHA512 860f7cf94e180125c46c943b60f62278d16226a2bcba4a28a810cfc630de704bad701340df7f368d4c445f06e639c32380e42566d86cfbc266f635ef4ba9c9ee
EBUILD engauge-5.2.ebuild 1293 BLAKE2B 2225bac7ed507d6922587e930bebfc47c3d944df5bd65141e472d1ca4ed83a38594f43e7233b9a82b7fe868ad90c78190f81ef882ae18248ecd95d61e94192e5 SHA512 935c106dad40e7c48255002c2d59c8db5524ceb3e818f554b4bbc660bc7e4f081aeba4fe3db21f3c38151cc66877eaf9730a825351236af690026996b3540e1c
MISC metadata.xml 337 BLAKE2B 8c46cdaadb388ccd12d29c41a075ec60130482855d0735cd468a174e631129964fec7c2e7649994e8f958def8ceb8f4ad0ecb60ab69ce37171c9945696825369 SHA512 41201e69d211283450ef6ff45a23e0978934044e170da84de7e7978360bd5ce1e3b277df4a90e00221cca3f987cd6839ee90fceea232c70cebeb69b5bc7c1c6d
diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
new file mode 100644
index 000000000000..ea7530fd0b5f
--- /dev/null
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils qmake-utils
+
+DESCRIPTION="Convert an image file showing a graph or map into numbers"
+HOMEPAGE="http://markummitchell.github.io/engauge-digitizer/"
+SRC_URI="https://github.com/markummitchell/engauge-digitizer/archive/v$PV.tar.gz -> engauge-digitizer-$PV.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples jpeg2k pdf"
+
+RDEPEND="dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ dev-qt/qthelp:5
+ dev-qt/qtnetwork:5
+ dev-libs/log4cpp
+ sci-libs/fftw:3.0
+ jpeg2k? ( media-libs/openjpeg:2 )
+ pdf? ( app-text/poppler[qt5] )"
+DEPEND="${RDEPEND}"
+
+S=$WORKDIR/engauge-digitizer-$PV
+
+src_prepare() {
+ eapply_user
+
+ # Make sure the documentation is looked for in the proper directory
+ sed -e "s:engauge-digitizer/engauge.qhc:${PF}/engauge.qhc:" \
+ -i src/Help/HelpWindow.cpp || die
+
+ # This otherwise overrides user CFLAGS
+ sed -e '/QMAKE_CXXFLAGS_WARN_ON/s/-O1//' \
+ -i engauge.pro || die
+
+ # Neuter the non-pkg-config hackery
+ sed -e '/error.*OPENJPEG_/d' \
+ -e '/LIBS.*OPENJPEG_LIB/d' \
+ -e '/QMAKE_POST_LINK.*OPENJPEG_LIB/d' \
+ -e '/error.*POPPLER_/d' \
+ -e '/LIBS.*POPPLER_LIB/d' \
+ -i engauge.pro || die
+}
+
+src_configure() {
+ eqmake5 \
+ CONFIG+=link_pkgconfig \
+ $(usex jpeg2k "CONFIG+=jpeg2000 PKGCONFIG+=libopenjp2" "") \
+ $(usex pdf "CONFIG+=pdf PKGCONFIG+=poppler-qt5" "") \
+ engauge.pro
+ pushd help >/dev/null || die
+ ./build || die
+ popd >/dev/null || die
+}
+
+src_install() {
+ dobin bin/engauge
+ doicon src/img/engauge-digitizer.svg
+ make_desktop_entry engauge "Engauge Digitizer" engauge-digitizer Graphics
+
+ # Install qt help files
+ insinto /usr/share/doc/${PF} # this must match sed expression in src_prepare
+ doins bin/documentation/engauge.{qch,qhc}
+ docompress -x "${EPREFIX%/}"/usr/share/doc/$PF/engauge.{qch,qhc}
+
+ if use doc; then
+ pushd doc >/dev/null || die
+ doins -r . || die "install documentation failed"
+ popd >/dev/null || die
+ fi
+ if use examples; then
+ doins -r samples || die "install examples failed"
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/media-gfx/fbgrab/Manifest b/media-gfx/fbgrab/Manifest
index bacd9f2e756c..eea2e5ce38e1 100644
--- a/media-gfx/fbgrab/Manifest
+++ b/media-gfx/fbgrab/Manifest
@@ -2,6 +2,6 @@ AUX fbgrab-1.0-Makefile.patch 428 BLAKE2B 6d2b35128b71ddde843351e79f221ce3c8ec60
AUX fbgrab-1.0-zlib_h.patch 263 BLAKE2B ef76dcd3320e31950beb9bc178533e8e99796790578faa8647ad58259aca7f6c0a5cb01422040b3cdac04f160fb25992ea45c275bdbdeb8d47788914af546cb7 SHA512 ac8576a25e963451ec298888208f92d8bb383c06655a96bf691779c5600db9c85c6e488b139519832b46878a46caba05d47f37ab27a3b2529f657341e5e93dbb
DIST fbgrab-1.0.tar.gz 11928 BLAKE2B 7a87727eb428e9612f1575e119995bac06ea0cb5499f075a296a111e4f983cebede5b1b2c0c76304c320e2dff36331e085e1124f4d9c34d6d33dcc792d760e8a SHA512 83346be21b3dc393165cfbb210284679e9fc746380fde9939d96d8174cd320d71cc6bfbf23a9495a107c8f0a6ded43342f843b530996f695ebba0388669a35f0
DIST fbgrab-1.3.tar.gz 13027 BLAKE2B 57acd93432b01befd99c73e45337bd2eecfdb18b9b5d98106e1a433b48bb03ef05cc5d3a99e0a34f501bb4d0731c8d6c92bcd8b145dd5f503632b63d41d902d5 SHA512 2d1166890f41d7de813a6c9b722db148980fcc802da38dea1a42d1f150cbdc16d0dd6757bc334586402f109b382e5039d44b03f9f19024f546958bdf21ca5d52
-EBUILD fbgrab-1.0-r2.ebuild 679 BLAKE2B 63c82d6e4a45881af375d9fdcf66ccc2693044460444078cc87ddca889635bdef8bd28dc15931eb04534898c68660cd6196592d09cf76f7245c9f2615106f1c4 SHA512 5dfe9dac506ace89c43bec3fc63841c04d82666185198028c18948cb88f484cad3308ff77bb7992885adacb5a63a4c2534e2fa3e40d64f016cb2d25915212f67
-EBUILD fbgrab-1.3.ebuild 619 BLAKE2B 1c47751578c9b5eb19036ee19ad35187ec17ce7869d12155f5109d25a1635b5cf0d735481a67ad82120b24a903835bb546939e635ca003b41fea5fa7647917b2 SHA512 67c4907d143d92d263e37776adb4acc021627d5297ee2789c84d09f0a78d37ba7f690bc53f09c989c139cbfe77f99594757d530114938e7b76d32b2d522199dd
+EBUILD fbgrab-1.0-r2.ebuild 681 BLAKE2B 70a68abab4e8ae84ffa80bad0aa5465b5785e4018fb0ec6747c3a81fa06b4da7ec5808a43b9a3960c3068f2c3d7a416397d4da8f49717ef7ff03015ea82d5504 SHA512 11806c19157a92bf3b799fa7e4ee9ddc0aadc8703d10fde65cff260b1c66d02e9aed7af270d57eb72503cc82596cd5e1e8491dfe90ac69d997a6dca729e379e5
+EBUILD fbgrab-1.3.ebuild 621 BLAKE2B 3b77470a9c15d6ed2e846c621e1071ad116c2e6c1ef25dc88052b5ee76e90f4f58f97659c4515ee770c896b6abea3f97c0431171553c7b70f7a7c70e6a18807c SHA512 25b0a43aa49b49527892b0226fcd11e58a9260d7077bd9da9f22ef43b26a8889ff9d3f7444b0249553af15a923bd3bbe83ce51210d5c741b2a3f293e3f979896
MISC metadata.xml 355 BLAKE2B 907ae0fec9a4a2284f98737d79de3747882c83bf3dee2588056ab3baa2720b987eda2930a3b79dae83327363d13fa72b98cc04d7b3d477f0b53f26eb6e11396b SHA512 31b407791cd97b141997fff192ac75298957edee59fe3a9c46d7a08f839b99ca2e4f3536632beca933d74a8e22464dbd7fd34fa61c106829c62c8dc69b1b8231
diff --git a/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild b/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild
index 77413c616e07..a6a0d1458ef1 100644
--- a/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild
+++ b/media-gfx/fbgrab/fbgrab-1.0-r2.ebuild
@@ -6,8 +6,8 @@ EAPI=5
inherit eutils toolchain-funcs
DESCRIPTION="Framebuffer screenshot utility"
-HOMEPAGE="http://hem.bredband.net/gmogmo/fbgrab/"
-SRC_URI="http://hem.bredband.net/gmogmo/${PN}/${P}.tar.gz"
+HOMEPAGE="https://hem.bredband.net/gmogmo/fbgrab/"
+SRC_URI="https://hem.bredband.net/gmogmo/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-gfx/fbgrab/fbgrab-1.3.ebuild b/media-gfx/fbgrab/fbgrab-1.3.ebuild
index 0a53b0370185..79ccfa440935 100644
--- a/media-gfx/fbgrab/fbgrab-1.3.ebuild
+++ b/media-gfx/fbgrab/fbgrab-1.3.ebuild
@@ -6,8 +6,8 @@ EAPI=5
inherit eutils toolchain-funcs
DESCRIPTION="Framebuffer screenshot utility"
-HOMEPAGE="http://fbgrab.monells.se/"
-SRC_URI="http://fbgrab.monells.se/${P}.tar.gz"
+HOMEPAGE="https://fbgrab.monells.se/"
+SRC_URI="https://fbgrab.monells.se/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index a3ab669457c3..4288f4b7aca4 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,9 +1,13 @@
DIST ImageMagick-6.9.9-31.tar.xz 8819864 BLAKE2B f6cdb19bff58a0b318a9af78f3fa429137cc4e79bbe075f9c6444204ce8a4324dde5792ab7232e6898a4993ad558c514a143c14469370de822038d1d669fdffa SHA512 85cbe4e4991a08a5c11c01b4276525fa1d63bcef9a9814fee1f8ede3a5ed432da8d3d84965ed75105723948d07ad879f7cf07d5121f0d624df9275dd4e41cb8f
DIST ImageMagick-6.9.9-40.tar.xz 8919136 BLAKE2B 04b9585948194e6ba03efa549d9ef6a8b12fce141346ddd7dc1b40e72349dc603bc6154a3826496dae47ff8c0eb5b6a5b80ae51a60d0d8a632debcd9229cf3da SHA512 416c2e248e3d1c6d89b930b8179194a9e1dfd160b9de1a75f98ceeb4199dd1b5f3b1d0ce646c26429054e7970680c40b77e2bf0a97ca82bbe84aa66648393fb4
+DIST ImageMagick-6.9.9-43.tar.xz 8912476 BLAKE2B e6106b321c68c05f048eeaa0beaaa87fe724556d9b16842bd0643d806f3a2cfae3016bc835dd9fe1f9842e8fd61ee52c6ddceea6ce44d9c265387cfd35b57d89 SHA512 ff5b7daf521b6e0ae8cc123a56eca72e2abafd08101f0134866745ddafe21c9a08a1f6c73218bc3d95d8afc79dd0f66926d514b2c6083468391efead5afac6e7
DIST ImageMagick-7.0.7-19.tar.xz 8546416 BLAKE2B 6750dba45f7971f7a7e74ac7ae3ec94732a2bd31f638afac8a91abd595e81aadca1372ddb46dcc3bf2dcb258ececfa69a8e8ad5ff753930462d46804863c0f4e SHA512 656520f719a375c837b2ddebb7e5920e9c06a9f81f3529b8a7c405958ca75f7464790ff931b7a32e104ef500570e71ff80d3dfb7c5cf777b2a5ad8207fde7928
DIST ImageMagick-7.0.7-28.tar.xz 8611096 BLAKE2B f4e70f32c5716f5e4673d9b938ea3924fbfc1005084bfad06afab493d50bcee2e43cd8b5ca0f83945dbc80f731c914633c2a401172e8d4e0289c7c9afe4b1209 SHA512 0a370ee3b8eb42c563bb15fa469208ee70520aa148af1752721e29be90a6a95a5773674f2d685d1f2fca77903f9592ffcbb9d7214ea96818848ea9dd135aef08
-EBUILD imagemagick-6.9.9.31.ebuild 5119 BLAKE2B 2cbb928e6cfe041c36fcdc672fb2a0919cd0aa21fa7f15d9a34ee041038a549e96f714995bebebce79645d8b90bba47a6d57545eba452d7a8067a9cb19553074 SHA512 e2d8cf21b2221d2ce766243ee805ad371b294fe4d00d3a0565ecc296acc027d99d5e6d90a8929621bb7363e1cd4b0a3e12aac34c7f4b2ce93106763b730aa436
-EBUILD imagemagick-6.9.9.40.ebuild 5120 BLAKE2B 743006779fe1fa491552b3296339b20525aee009fead6a0ccdf0a47b0241ea1fa96f92c812a2c76c720b82093ef133abd68a683c4ca93d9b7f7295066a6175c5 SHA512 6ba2b95f552ec595f5a6d53d93a7b51ea087d326b5953e702bcbe98e18dce88aa523a4d4aee57933540c3e9b42e02654d9ceb0faf1499487adb8bb6148f2de84
-EBUILD imagemagick-7.0.7.19.ebuild 5125 BLAKE2B 9fa2d0ba9e119d28bea9119012f1da9ff36e1f46ee33658439fdc7b6d1c6d766168409c91cc9b9850b6a4cb3ba5705517a4b18ba8c42094567263ce97417ee4e SHA512 0db05a2bf38b3be497655cefe90873df4868796874da5607620ea1c65c7e59ed34b16746255ee71d2987c9906a40ca730c48785f6e86c4ec69e2cbfc5c32fb40
-EBUILD imagemagick-7.0.7.28.ebuild 5126 BLAKE2B d72b2d20622f173d4734854359886a2b786e5be9e5cd153ca8adcbb98693b005c87d947063fd368ddf7e39345ff0937c2ac36c746269c8099720298161bb77fc SHA512 292096aa5856a91a8434605172132d5e57a686b4be2422d5e7e0f00dd162e867811c21cbd4693a5a7e51cc1b6aba69692582818abd563ef185b172aae0c0e2bc
+DIST ImageMagick-7.0.7-31.tar.xz 8613064 BLAKE2B 6d4f731002cf099b5fc007e645fbfec32fb87b5f9b77f1c8a15897fed44c5fe55f8d356775675c709cf3ea600a2cbf67b8b9c7d7a0cec5c55647714d5d0ade27 SHA512 6575c009b021eb759e2129908e8deafcfa766758aae0b8f51d8b0c555444440c404bf20df63671259315b7e33476322217e3239aa2ba1c8b938996d54e988ee5
+EBUILD imagemagick-6.9.9.31.ebuild 5120 BLAKE2B 0d046adad40ac52ebb6f091eae800054b7c22ebd425f6e64a7de68fd6f10ecd699c537a5284f39f496f02be1ecfc44252209599589a3c8686f81988a8e7adfbd SHA512 b45803b538b7d1c6e3d4c3abcd363354b561e01360eaf36cf587e61bae66bbc2543d754dbae8b782cff89aafec267538253f6e3af34211e146e152d1a688e140
+EBUILD imagemagick-6.9.9.40.ebuild 5121 BLAKE2B 686029e7c87384f8f6e06c0eb0ed3a348a48b0e52bddca4f4942cc105b2f1d280859031c9aa6ea9198c981373e74a9f9dd19e95e553e62b6e9d6f9c3d41b8265 SHA512 4c02b42d699833cc4ab7597d576d21d64f991bb947d9193992ce3100d0599fa0cd71306c93316521409b096bd813f3720a474283491dc3e937a8a68264b3b3e7
+EBUILD imagemagick-6.9.9.43.ebuild 5129 BLAKE2B b7b332d8137559fc443657fe4510668dce05852e1012d055cf8612668182ead6b20850a0182340ca9f6ebdb96356ab63c99c788ff4eb3ffc961a166d80059c3e SHA512 aa9cc3f5bed77db0a14ad9fc2400393287ff6656d31fc9dce58b969c04a38c6efbd4b6c48a9cef0e19407315226766725147341bd9bf86db184d729586c9bb20
+EBUILD imagemagick-7.0.7.19.ebuild 5126 BLAKE2B 944cdfc402eaf48aeeb4fc8fe7411233774ff8c44cab855aa50b79c22502adeeb38879fc8c454c428504b8d290e4fa7b41386a3a0404204df322928cf180425c SHA512 a9b3b238e38e931d534fe4826b0ba525bc6c9850a1aca244c701199d66fa989faf86d7c0a4995a0012e5bb68bbf09e15628494aebe8bbb3b8dc8a725a5e95885
+EBUILD imagemagick-7.0.7.28.ebuild 5127 BLAKE2B 8f974d1ca9caeafa2894d3210407f9f0455bd342c3c92505e595bb623ee1e729cecab7f4229f124a74e8ca6d25d942646b69af2c3f01ccf7fe617bdf167ab0c2 SHA512 4f87c1cf80d6e9fa77e2a7f5241e7958afc151c4d434b87f305e9a528ed1f238fe383f0276916b138ac11c769c3acfcefa5b4a420e16c2f0dcb41e66eaaecf34
+EBUILD imagemagick-7.0.7.31.ebuild 5135 BLAKE2B 4ae4afe162f2ee49efff7e8411db1c3b6091ce92d5f87bf361e2efe4b4414b8357a480b5f29d4c65f7291f673e7e5324dd42dd84dd4f387e40230394cf60cc70 SHA512 73588fd964051bc8ba3e1465b25e63a90882d8b452a04a9cd40070953a6c3c59ccfc8fd64b4a7f537d6d1811b7f8160db534abcb46bd6e0be4260e0ff1138b77
MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
index 22edbc5a0ffd..f92a349caf39 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
MY_P=ImageMagick-$(replace_version_separator 3 '-')
DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.imagemagick.org/"
+HOMEPAGE="https://www.imagemagick.org/"
SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
LICENSE="imagemagick"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
index d971391a6a9c..7805c757cc97 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
MY_P=ImageMagick-$(replace_version_separator 3 '-')
DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.imagemagick.org/"
+HOMEPAGE="https://www.imagemagick.org/"
SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
LICENSE="imagemagick"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.43.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.43.ebuild
new file mode 100644
index 000000000000..52e77059cb1d
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.43.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+ dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ corefonts? ( media-fonts/corefonts )
+ djvu? ( app-text/djvu )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+ graphviz? ( media-gfx/graphviz )
+ jbig? ( >=media-libs/jbigkit-2:= )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+ lcms? ( media-libs/lcms:2= )
+ lqr? ( media-libs/liblqr )
+ opencl? ( virtual/opencl )
+ openexr? ( media-libs/openexr:0= )
+ pango? ( x11-libs/pango )
+ perl? ( >=dev-lang/perl-5.8.8:0= )
+ png? ( media-libs/libpng:0= )
+ postscript? ( app-text/ghostscript-gpl )
+ raw? ( media-gfx/ufraw )
+ svg? ( gnome-base/librsvg )
+ tiff? ( media-libs/tiff:0= )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:0= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ )
+ xml? ( dev-libs/libxml2:= )
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+ !media-gfx/graphicsmagick[imagemagick]
+ virtual/pkgconfig
+ X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+ test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ local mesa_cards ati_cards nvidia_cards render_cards
+ default
+
+ elibtoolize # for Darwin modules
+
+ # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ shopt -s nullglob
+ ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+ if test -n "${ati_cards}"; then
+ addpredict "${ati_cards}"
+ fi
+ mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+ if test -n "${mesa_cards}"; then
+ addpredict "${mesa_cards}"
+ fi
+ nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+ if test -n "${nvidia_cards}"; then
+ addpredict "${nvidia_cards}"
+ fi
+ render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+ if test -n "${render_cards}"; then
+ addpredict "${render_cards}"
+ fi
+ shopt -u nullglob
+ addpredict /dev/nvidiactl
+}
+
+src_configure() {
+ local depth=16
+ use q8 && depth=8
+ use q32 && depth=32
+
+ local openmp=disable
+ use openmp && { tc-has-openmp && openmp=enable; }
+
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ $(use_enable hdri)
+ $(use_enable opencl)
+ --with-threads
+ --with-modules
+ --with-quantum-depth=${depth}
+ $(use_with cxx magick-plus-plus)
+ $(use_with perl)
+ --with-perl-options='INSTALLDIRS=vendor'
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+ $(use_with bzip2 bzlib)
+ $(use_with X x)
+ $(use_with zlib)
+ --without-autotrace
+ $(use_with postscript dps)
+ $(use_with djvu)
+ --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+ $(use_with fftw)
+ $(use_with fpx)
+ $(use_with fontconfig)
+ $(use_with truetype freetype)
+ $(use_with postscript gslib)
+ $(use_with graphviz gvc)
+ $(use_with jbig)
+ $(use_with jpeg)
+ $(use_with jpeg2k openjp2)
+ $(use_with lcms)
+ $(use_with lqr)
+ $(use_with lzma)
+ $(use_with openexr)
+ $(use_with pango)
+ $(use_with png)
+ $(use_with svg rsvg)
+ $(use_with tiff)
+ $(use_with webp)
+ $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+ $(use_with wmf)
+ $(use_with xml)
+ --${openmp}-openmp
+ --with-gcc-arch=no-automagic
+ )
+ CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+ emake check
+}
+
+src_install() {
+ # Ensure documentation installation files and paths with each release!
+ emake \
+ DESTDIR="${D}" \
+ DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+ install
+
+ rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+ dodoc {AUTHORS,README}.txt ChangeLog
+
+ if use perl; then
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+ if use opencl; then
+ cat <<-EOF > "${T}"/99${PN}
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+ EOF
+
+ insinto /etc/sandbox.d
+ doins "${T}"/99${PN} #472766
+ fi
+
+ insinto /usr/share/${PN}
+ doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
index 4874250e8c06..0c38238d52c4 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
MY_P=ImageMagick-$(replace_version_separator 3 '-')
DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.imagemagick.org/"
+HOMEPAGE="https://www.imagemagick.org/"
SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
LICENSE="imagemagick"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
index 7b4ac4bbb033..ba362cfde7f7 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
MY_P=ImageMagick-$(replace_version_separator 3 '-')
DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.imagemagick.org/"
+HOMEPAGE="https://www.imagemagick.org/"
SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
LICENSE="imagemagick"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.31.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.31.ebuild
new file mode 100644
index 000000000000..1db0353011d7
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.31.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+ dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ corefonts? ( media-fonts/corefonts )
+ djvu? ( app-text/djvu )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+ graphviz? ( media-gfx/graphviz )
+ jbig? ( >=media-libs/jbigkit-2:= )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+ lcms? ( media-libs/lcms:2= )
+ lqr? ( media-libs/liblqr )
+ opencl? ( virtual/opencl )
+ openexr? ( media-libs/openexr:0= )
+ pango? ( x11-libs/pango )
+ perl? ( >=dev-lang/perl-5.8.8:0= )
+ png? ( media-libs/libpng:0= )
+ postscript? ( app-text/ghostscript-gpl )
+ raw? ( media-gfx/ufraw )
+ svg? ( gnome-base/librsvg )
+ tiff? ( media-libs/tiff:0= )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:0= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ )
+ xml? ( dev-libs/libxml2:= )
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+ !media-gfx/graphicsmagick[imagemagick]
+ virtual/pkgconfig
+ X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+ test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ local ati_cards mesa_cards nvidia_cards render_cards
+ default
+
+ elibtoolize # for Darwin modules
+
+ # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ shopt -s nullglob
+ ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+ if test -n "${ati_cards}"; then
+ addpredict "${ati_cards}"
+ fi
+ mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+ if test -n "${mesa_cards}"; then
+ addpredict "${mesa_cards}"
+ fi
+ nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+ if test -n "${nvidia_cards}"; then
+ addpredict "${nvidia_cards}"
+ fi
+ render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+ if test -n "${render_cards}"; then
+ addpredict "${render_cards}"
+ fi
+ shopt -u nullglob
+ addpredict /dev/nvidiactl
+}
+
+src_configure() {
+ local depth=16
+ use q8 && depth=8
+ use q32 && depth=32
+
+ local openmp=disable
+ use openmp && { tc-has-openmp && openmp=enable; }
+
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ $(use_enable hdri)
+ $(use_enable opencl)
+ --with-threads
+ --with-modules
+ --with-quantum-depth=${depth}
+ $(use_with cxx magick-plus-plus)
+ $(use_with perl)
+ --with-perl-options='INSTALLDIRS=vendor'
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+ $(use_with bzip2 bzlib)
+ $(use_with X x)
+ $(use_with zlib)
+ --without-autotrace
+ $(use_with postscript dps)
+ $(use_with djvu)
+ --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+ $(use_with fftw)
+ $(use_with fpx)
+ $(use_with fontconfig)
+ $(use_with truetype freetype)
+ $(use_with postscript gslib)
+ $(use_with graphviz gvc)
+ $(use_with jbig)
+ $(use_with jpeg)
+ $(use_with jpeg2k openjp2)
+ $(use_with lcms)
+ $(use_with lqr)
+ $(use_with lzma)
+ $(use_with openexr)
+ $(use_with pango)
+ $(use_with png)
+ $(use_with svg rsvg)
+ $(use_with tiff)
+ $(use_with webp)
+ $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+ $(use_with wmf)
+ $(use_with xml)
+ --${openmp}-openmp
+ --with-gcc-arch=no-automagic
+ )
+ CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+ emake check
+}
+
+src_install() {
+ # Ensure documentation installation files and paths with each release!
+ emake \
+ DESTDIR="${D}" \
+ DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+ install
+
+ rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+ dodoc {AUTHORS,README}.txt ChangeLog
+
+ if use perl; then
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+ if use opencl; then
+ cat <<-EOF > "${T}"/99${PN}
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+ EOF
+
+ insinto /etc/sandbox.d
+ doins "${T}"/99${PN} #472766
+ fi
+
+ insinto /usr/share/${PN}
+ doins config/*icm
+}
diff --git a/media-gfx/scantailor/Manifest b/media-gfx/scantailor/Manifest
deleted file mode 100644
index cd4f6ba5f0db..000000000000
--- a/media-gfx/scantailor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scantailor-0.9.12.2.tar.gz 1207379 BLAKE2B a2949c0d9a495d50927d27e33f889567a033149c3745ad522b00d3ea3b6a0c0bc7e6cc66dd79acd3b29b95eb41293774ff78215b5da7618dfd51757e1b1e6ab5 SHA512 d98603c5b3dfadeae3bda66d8b5ea085107edf9ee03efd299d50bf88a01f2b1092957f1ed4abe1a5d53b9028b7dec16dc5a8452d1a197fe0f3aaddeff6d02793
-EBUILD scantailor-0.9.12.2.ebuild 1145 BLAKE2B 71f0f2a643a491ff37f0803bf304ee8e7520f6259de415212af6c6eda9d7b8be814c6a063112174cd155e67d5ef4ec100ff5e77408727dadefec4738718de503 SHA512 451755455e848fe065829dffd38acdecab33e8dc53e25c064045efe5fb06c523041a45e25e84bf7f7a74cad47d2ce37c0a29ec50aafc0d6f27ffeee4df9242d8
-MISC metadata.xml 345 BLAKE2B 309269dbfc7a962d80f42e3ae5f034d26dace8d374e75c50dad2547725ade2c6b57cfe09e9754a20f003e73e33d3077331ec6edc3927516e283bda7a175ba14c SHA512 9cf847f38815e0611b5fe52a7a70a8a51d21a48ba68b13a204de1c3d8613e472a815790597bd691215ba09a50d57c5b6a7c7b122cf4bee166d89384f43a2045d
diff --git a/media-gfx/scantailor/metadata.xml b/media-gfx/scantailor/metadata.xml
deleted file mode 100644
index 9e17a6dcaa61..000000000000
--- a/media-gfx/scantailor/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>graphics@gentoo.org</email>
- <name>Gentoo Graphics Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">scantailor/scantailor</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-gfx/scantailor/scantailor-0.9.12.2.ebuild b/media-gfx/scantailor/scantailor-0.9.12.2.ebuild
deleted file mode 100644
index 6dee26316088..000000000000
--- a/media-gfx/scantailor/scantailor-0.9.12.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils virtualx toolchain-funcs versionator
-MY_PV="RELEASE_$(replace_all_version_separators _)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A interactive post-processing tool for scanned pages"
-HOMEPAGE="http://scantailor.org/ https://github.com/scantailor/scantailor"
-SRC_URI="https://github.com/scantailor/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="opengl"
-
-RDEPEND="
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- media-libs/libpng:0
- media-libs/tiff:0
- sys-libs/zlib
- virtual/jpeg:0
- x11-libs/libXrender
- opengl? ( dev-qt/qtopengl:4 )"
-DEPEND="${RDEPEND}
- dev-libs/boost"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_configure() {
- tc-export CXX
-
- local mycmakeargs=(
- -DCOMPILER_FLAGS_OVERRIDDEN=ON
- -DENABLE_OPENGL=$(usex opengl)
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd "${CMAKE_BUILD_DIR}" || die
- virtx emake test
-}
-
-src_install() {
- cmake-utils_src_install
-
- newicon resources/appicon.svg ${PN}.svg
- make_desktop_entry ${PN} "Scan Tailor"
-}
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index fb6f3a618661..1cf2aa71035e 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,7 +1,9 @@
DIST shotwell-0.26.4.tar.xz 5619280 BLAKE2B 0ca9ecf6e96019aa8e9bd4bae09d1b888902fc054633271854e09e1fa9b474774b7b5f2e6e3bcfed60a5b0f3ba30a2d89133d2676a94db5f4da6ee6a0af41102 SHA512 6a0772a40759d636807652ef27814306cbc2217119b071590db36c628b6e9d04f876ae1748c88476fbebc1db0c83e6a108c9f74261b7faa348c6bd37c1da198d
DIST shotwell-0.28.2.tar.xz 5582276 BLAKE2B 20d35f714543d35bd04fe81617040419664e662664ae504cbfb0b3bb160d97a5469478e1e134b6432b174fc19bb4fc370b5eb38c576c805e876d00999fb7d979 SHA512 dc00f45e55eabadaaf825de5a4152d40db2eb652f966b870a08d36006887a18aacf570b05d232a9fc7ef7df097a468a497778022bf7b86ae2143877c02540cc0
+DIST shotwell-0.28.3.tar.xz 5531900 BLAKE2B b585989434e3da9b2d5f43aabf41451e33b7b2f537a21305ff9decd9992d42e5422971d1f89836936630f641efdac1242dc21574d86f61a4c71562b657e0300d SHA512 9a0c15bfe856dabaa85038fe875cc178be6a3e104397b36555005615212ac92579234fc6277f1a4a7bddba517e9ea0db5ed06e0fc30614453e3db1153b47dc16
DIST shotwell-0.29.1.tar.xz 2368080 BLAKE2B b706229803528c55486219a4190d1145d98b513ff26a4a3d2989abd57ff3465ffab231b1779014b7babf7ce33cc875fa11905a95bbf108251c57d3692a5156a4 SHA512 25e7e7d303ecbe89ecf4eba219b6f10ad44d23209d2c2724c6d61afae47afc0a6e1a7a7fe99931888f7374419818c5d74e28bb6120383e191c038c967c84ce39
EBUILD shotwell-0.26.4.ebuild 1488 BLAKE2B a18a437d65ca3a9999f0f238d7442564c012b08d209384d8b47fedd12a8eca4c1e91e28ba18b456ff860c56a16cd1059b2d7a0541d06f10d2937efcf893a607b SHA512 2cd5b9e390f61de3d0db9ff5d0ea59ff36eef745afb237ea82d87f584fda7ca200b95eb7273e1a74f401e5a7187e8eb78c98910723d68dccdf90535a094bd0d6
EBUILD shotwell-0.28.2.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
+EBUILD shotwell-0.28.3.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
EBUILD shotwell-0.29.1.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a
MISC metadata.xml 900 BLAKE2B 62d1bd65c242a5da435f9217c538250495879be4d0b2de3477111018ed456f019abeb0bf678835997ff2c567fdbb844ca257d0c4bad8d07c3ad590adc82202cf SHA512 aab4bb7556cb7fc926b59e68d16a2425af57cab5ae80c68ce2dd650bf49b9e3872771fee51552aa0aba9c50167a33b1976700f65bbc1531de44ac638cdd4a0be
diff --git a/media-gfx/shotwell/shotwell-0.28.3.ebuild b/media-gfx/shotwell/shotwell-0.28.3.ebuild
new file mode 100644
index 000000000000..ed1f73414218
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.28.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.28"
+
+inherit 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"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+ >=app-crypt/gcr-3[gtk]
+ >=dev-db/sqlite-3.5.9:3
+ >=dev-libs/glib-2.40.0:2
+ >=dev-libs/json-glib-0.7.6
+ >=dev-libs/libgee-0.8.5:0.8
+ >=dev-libs/libxml2-2.6.32:2
+ gnome-base/dconf
+ >=media-libs/gexiv2-0.10.4
+ 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.5:=
+ >=media-libs/libraw-0.13.2:=
+ media-plugins/gst-plugins-gdkpixbuf:1.0
+ >=net-libs/libsoup-2.42.0:2.4
+ net-libs/webkit-gtk:4
+ virtual/libgudev:=[introspection]
+ >=x11-libs/gtk+-3.14.0:3[X]
+ dev-libs/libgdata
+
+"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.7
+ >=sys-devel/m4-1.4.13
+ virtual/pkgconfig
+"
+
+# 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"
+
+src_prepare() {
+ vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure --disable-static
+}
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 6f183956f1d4..392e18b6e00e 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,11 +1,7 @@
AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1
-AUX zbar-0.10-no-v4l1-check.patch 2270 BLAKE2B aeaeeeed38d5d2d7cf500d8a10f294341aadab8cc1a0843a3b4aa3fa2f5d3b5857112ea15a73c85b09c10ee0d1ccc1f855ac44d54179f2801c6d4ac0dd0bca88 SHA512 f2f66476769469d701206bf1efae16d384cfbaa138c877a0ea32bedcd39b5abfd6dae630e7d729b009ab50052db0166198949f49ddfb66d708792000808da74d
AUX zbar-0.10-python-crash.patch 604 BLAKE2B 463f23b6338455b0029fce845fcbb02168c86b9ddc116f34f15668459d8ac86d77dabe388cd61af9182c02be37475363ff832d7c8c705d29bf1829f7ccb167b3 SHA512 56e1848466b2178fb25a1f88f1a35113c01d370927b5778af96f1b96bcdaa8349308ac7ef14fb247bc5ec4165b2f7daa717159f3f7786ced9c043428afd641ba
AUX zbar-0.10-v4l2-uvcvideo.patch 1487 BLAKE2B 61486465183a50ee0e515d6232923c63819e707d4a429a653f94ea6b7f404e8a5ab54602e074df0fab3f0188c50e8f4fc12a6ac5a63509484d7cd24925bb1957 SHA512 6a53eb54ed3ad83cacb9a09d0b119550d364e586990725f0a423a180fab790e18c2c6d8201d185a51bd26ea3955018416b2993fbdb5e5a555e13183b3bce7b1a
AUX zbar-0.10_p20121015-ImageMagick-7.diff 1064 BLAKE2B 95d67582bbc8ad65aa23c8a7a5152c198c0a9c105189c769b785d418128871d326ff3b9c8ed52e316e3e0b0fc5c6e9c247c0115b6d82ccb812f243cfaab93138 SHA512 90e09dabfaec0f1e68e8bdb040a2903377c658a39f9d0beb1a92546c26acf7e68115a6f6a745f930edc7c55353f51c7f58888fea564c259d1f5155ff1f35d6f9
-DIST zbar-0.10.tar.bz2 592602 BLAKE2B e3379bb915d52912e9d64b4166c60e0625b1c3aae06492040b958b822e14cb9d5974e1e6b1dc69ef3cc4db11115aae76c98359198f1d0fad81312da3e6226e16 SHA512 76cb8a469e3ac9ea7932a95c500cf933501249cdb8dce4df558bf5681bd44c62111327b494e6e887079a5fd30b32154887dcc12962e6d27b1453f55457483db4
DIST zbar-0.10_p20121015.zip 991578 BLAKE2B 021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18 SHA512 7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1
-EBUILD zbar-0.10-r6.ebuild 1742 BLAKE2B 1ef919eae08a5aca610dcede6c34b5f6325f20cd384a406642d3f040efc7ff2b01f8e2d8d6a75a9abac290bf9dcd4e2b9dbcf5e197c1e8b9842d9d83d039eda9 SHA512 6a03ed2a6ed2b3a1c28cd58703600869148428030151f779324fc06d32d6fd1eae74584c40c53aba3f38b999229a01e2ce275fbb8e31885d951efa5ad42f9897
-EBUILD zbar-0.10_p20121015-r1.ebuild 2397 BLAKE2B 2fa90db3ece690a7b988139e1fcdd089892967d9141a4dff719af8b4d91a8ff3bd16168a978ab298bac54338c41b8cedd9e03cb9cda9bdda2d8186142cf16067 SHA512 b5f6232d3fce9cb1842d5630537ff52056b185036506bae78f605dc5d2f0ec54f5d41edb2d58b6caa379e1f7dfdd266fcc9bd0d454eada9c73507924ae9dad55
-EBUILD zbar-0.10_p20121015-r2.ebuild 3644 BLAKE2B cd003a0f9801fa2474602024116fcc90cee831deef02920503ac47ee4eec0b347e663941141902b599c20e37c865929bdf29eccde9308cce5157a41269f83612 SHA512 77657b8a159511b20573c04064c710b4a92514a41cad0104d8b955b631330b89939eed3e05289c4ef0f6344d1dfecd6bc73173c56c154fc6b6866aaf508486a4
+EBUILD zbar-0.10_p20121015-r3.ebuild 3551 BLAKE2B 3e3b0d7557555561cbab893a3fc8c0be9add582606919c7c50cb257cebe84c5b8c2f863df7744c770aa51508220bd9a3290d7d4f9b5ab662858d88c4866fb41a SHA512 130c52b8e2d7ecadfd6e248309fb649bfff97c458c173e2b64ae1b82bdfed5f3ec255c02f1e2de99db0c6316b2fbc052d7823ebc74d3a355f8803e08be4ff6c5
MISC metadata.xml 317 BLAKE2B f900040957f979d0931359e9399f89d60de14ef9e7d359de21f5c02807748a3efb0004926ab2890708511908b21aba7b824eace5bd13f5194c7f6bb633d4bd98 SHA512 911dee4073890017c8816d892b3e77e460328fc8e25e59c3ba74eafc909de73d743ac8c1c3015385bcbba1e7f175796704f6b1be6b1f37e0ce652da1749ee830
diff --git a/media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch b/media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch
deleted file mode 100644
index b25827a0b998..000000000000
--- a/media-gfx/zbar/files/zbar-0.10-no-v4l1-check.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- zbar-0.10/configure.ac
-+++ zbar-0.10/configure.ac
-@@ -147,19 +147,13 @@
- with_video="no"
- AS_IF([test "x$enable_video" != "xno"],
- [AS_IF([test "x$win32" = "xno"],
-- [AC_CHECK_HEADERS([linux/videodev.h], [with_video="v4l1"],
-- [AC_MSG_FAILURE([test for video support failed!
--rebuild your kernel to include video4linux support or
--configure --disable-video to skip building video support.])])
-- AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"],
-+ [AC_CHECK_HEADERS([linux/videodev2.h], [with_video="v4l2"],
- [AC_MSG_WARN([v4l2 API not detected, upgrade your kernel!])])],
- [AC_CHECK_HEADERS([vfw.h], [with_video="vfw"],
- [AC_MSG_FAILURE([test for VfW video support failed!
- configure --disable-video to skip building vidoe support.])])])
- ])
- AM_CONDITIONAL([HAVE_VIDEO], [test "x$enable_video" != "xno"])
--AM_CONDITIONAL([HAVE_V4L1],
-- [test "x$with_video" = "xv4l1" || test "x$with_video" = "xv4l2"])
- AM_CONDITIONAL([HAVE_V4L2], [test "x$with_video" = "xv4l2"])
-
- dnl X
---- zbar-0.10/zbar/Makefile.am.inc
-+++ zbar-0.10/zbar/Makefile.am.inc
-@@ -53,12 +53,9 @@
- zbar_libzbar_la_SOURCES += zbar/processor/posix.h zbar/processor/posix.c
- endif
-
--if HAVE_V4L1
--zbar_libzbar_la_SOURCES += zbar/video/v4l1.c
- if HAVE_V4L2
- zbar_libzbar_la_SOURCES += zbar/video/v4l2.c
- endif
--endif
- if WIN32
- if HAVE_VIDEO
- zbar_libzbar_la_SOURCES += zbar/video/vfw.c
---- zbar-0.10/zbar/video/v4l2.c
-+++ zbar-0.10/zbar/video/v4l2.c
-@@ -39,6 +39,9 @@
- # include <sys/mman.h>
- #endif
- #include <linux/videodev2.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-
- #include "video.h"
- #include "image.h"
-@@ -507,3 +507,23 @@
- vdo->dq = v4l2_dq;
- return(0);
- }
-+
-+int _zbar_video_open (zbar_video_t *vdo,
-+ const char *dev)
-+{
-+ vdo->fd = open(dev, O_RDWR);
-+ if(vdo->fd < 0)
-+ return(err_capture_str(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-+ "opening video device '%s'", dev));
-+ zprintf(1, "opened camera device %s (fd=%d)\n", dev, vdo->fd);
-+
-+ int rc = -1;
-+ if(vdo->intf != VIDEO_V4L1)
-+ rc = _zbar_v4l2_probe(vdo);
-+
-+ if(rc && vdo->fd >= 0) {
-+ close(vdo->fd);
-+ vdo->fd = -1;
-+ }
-+ return(rc);
-+}
diff --git a/media-gfx/zbar/zbar-0.10-r6.ebuild b/media-gfx/zbar/zbar-0.10-r6.ebuild
deleted file mode 100644
index 618e4f0f1ffe..000000000000
--- a/media-gfx/zbar/zbar-0.10-r6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic python-single-r1
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="http://zbar.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zbar/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
- imagemagick? ( virtual/imagemagick-tools )
- jpeg? ( virtual/jpeg:0 )
- python? (
- ${PYTHON_DEPS}
- gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
- )
- qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
- X? (
- x11-libs/libXext
- xv? ( x11-libs/libXv )
- )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-no-v4l1-check.patch \
- "${FILESDIR}"/${P}-errors.patch \
- "${FILESDIR}"/${P}-python-crash.patch \
- "${FILESDIR}"/${P}-v4l2-uvcvideo.patch
-
- use python && python_fix_shebang examples/upcrpc.py test/*.py
-
- sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' configure.ac || die #423581
- eautoreconf
-}
-
-src_configure() {
- append-cppflags -DNDEBUG
- econf \
- $(use_with jpeg) \
- $(use_with gtk) \
- $(use_with imagemagick) \
- $(use_with python) \
- $(use_with qt4 qt) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with X x) \
- $(use_with xv xv) \
- $(use_enable v4l video)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc HACKING NEWS README TODO
- rm -r "${ED}"/usr/share/doc/${PN}
- prune_libtool_files --all
-}
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild
deleted file mode 100644
index d07b29d89057..000000000000
--- a/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="http://zbar.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk imagemagick java jpeg python qt4 static-libs +threads v4l X xv"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
- imagemagick? ( virtual/imagemagick-tools )
- jpeg? ( virtual/jpeg:0 )
- python? (
- ${PYTHON_DEPS}
- gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
- )
- qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
- X? (
- x11-libs/libXext
- xv? ( x11-libs/libXv )
- )"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.4 )"
-DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.4 )
- sys-devel/gettext
- virtual/pkgconfig"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
- #vcs-snapshot doesn't work on .zip
- default
- mv * ${P} || die
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.10-errors.patch \
- "${FILESDIR}"/${PN}-0.10-python-crash.patch \
- "${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch
-
- if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
- epatch "${FILESDIR}/${P}-ImageMagick-7.diff"
- fi
-
- use python && python_fix_shebang examples/upcrpc.py test/*.py
- java-pkg-opt-2_src_prepare
-
- sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
- -e '/^AM_CFLAGS=/s: -Werror::' \
- -i configure.ac || die
- sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
- -i java/Makefile.am
- eautoreconf
-}
-
-src_configure() {
- if use java; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
- fi
-
- append-cppflags -DNDEBUG
- econf \
- $(use_with java) \
- $(use_with jpeg) \
- $(use_with gtk) \
- $(use_with imagemagick) \
- $(use_with python) \
- $(use_with qt4 qt) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread) \
- $(use_with X x) \
- $(use_with xv xv) \
- $(use_enable v4l video)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc HACKING NEWS README TODO
- rm -r "${ED}"/usr/share/doc/${PN}
- prune_libtool_files --all
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
-}
diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
index 6c764241f4d0..ecdd0ad2dbfc 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~arm x86"
-IUSE="gtk imagemagick java jpeg python qt4 static-libs test +threads v4l X xv"
+IUSE="gtk imagemagick java jpeg python static-libs test +threads v4l X xv"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
test? ( X ${PYTHON_REQUIRED_USE} )"
@@ -27,8 +27,6 @@ CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}]
${PYTHON_DEPS}
gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
)
- qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}]
- dev-qt/qtgui:4[${MULTILIB_USEDEP}] )
X? (
x11-libs/libXext[${MULTILIB_USEDEP}]
xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
@@ -109,7 +107,7 @@ multilib_src_configure() {
${myimagemagick} \
${mygraphicsmagick} \
$(multilib_native_use_with python) \
- $(use_with qt4 qt) \
+ --without-qt \
$(use_enable static-libs static) \
$(use_enable threads pthread) \
$(use_with X x) \