diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
| commit | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch) | |
| tree | ade7cb031f363fad64c77139dea7aa3d81908537 /media-gfx | |
| parent | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff) | |
gentoo resync : 16.02.1018
Diffstat (limited to 'media-gfx')
44 files changed, 185 insertions, 721 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 548bf9cb46d2..0c01393e0826 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/aview/Manifest b/media-gfx/aview/Manifest index 3b80b6f4c546..93f528a586f7 100644 --- a/media-gfx/aview/Manifest +++ b/media-gfx/aview/Manifest @@ -1,8 +1,5 @@ AUX aview-1.3.0_rc1-asciiview.patch 1936 BLAKE2B bdf5ba38805fb2f8920ca9c3b342a69b76b01d33df5667a57ba0cbdcde576f8847f7b0cac420f3744516f74725e72ef1170d44a21a53536046d33329d6a7a83e SHA512 3666e403e5ed8b4be557b8aea314e33e5ad7162c2d7c7291810b4bc6824161f53a5b5b5325c4a4667467f72582303693710750e1d30a3761304346bc335f6299 -AUX aview-1.3.0_rc1-filename-spaces.patch 1393 BLAKE2B 054b0bfc569394f305ebfcadddb46b7e6cb432284c5fe90ccd99429b9e5fd504d1baf30a50aa58b78fa520280b2b00cebbd372d93f8660a8029002f2e0e19271 SHA512 837ecdf7116946baa752db47a446bf48527b3a3aa1457a900a93117f06ee2e2dea3d7bcf8d82f220acf59db21617fb54fa1154802e3f06bcd341ef71780fb6ec AUX aview-1.3.0_rc1-includes.patch 281 BLAKE2B 768cd3d142a119910e88b0cd219ec1a431549df18427cb3ae22fd91ae99ec23fc223da8025fc9bff82fd8268dcb7dcd017d0c53ad6c323bd4e3735cd9f658b38 SHA512 c8a5303be05a9205baba541e286725413fd8e8b161cb7d0bb1a32a8809b4e977ca12b9bd0df2c793be0e72e2353fdf9b09f96d541d361c5df87af7885cc350c7 -AUX aview-1.3.0_rc1-tmp_creation.patch 1142 BLAKE2B 6042d5b39f2a0f9a4be0207b8d57ff55ef203ed9d6d80ccb593770cc2864262dcc7850bb17ad0414702cad1fc7d17c6ad95d3580dd4ad5639c59d9c719c6aedc SHA512 7fdc336cd2c595754f46948031722f87bb40b0e159950f84ed0959ccdacd01840c0d24dfeac6a9937ab456b8ed66e5c9b8d49a4e98ee45ec64295f8234249d06 DIST aview-1.3.0rc1.tar.gz 54317 BLAKE2B 3a47dab51763f7c5cd9d4d5950437f3e0b86b46a9bf498c93e88258daefb511c82789b1d4bb1288844dbc70aae033fd0ffd9ffab4b28eb553effa7a2c777ef69 SHA512 941f2a92aaf3852b403daf688cda4ca2eb82ec32ee6566cd2aef3d121f259f1bb0214f872c4d5020c658bd81adba0577313acc5972d2f44b295f21905e107144 -EBUILD aview-1.3.0_rc1-r1.ebuild 714 BLAKE2B c73e2364234b5b75fab250963c43ef13924c6dcab5333a9e405701e1b7adc35d7830f71645e707a6562d145240ecfe5720a46179e875d1b4dae23387944b0ecf SHA512 4ac6bfc8e11ba1e4d1b6dc8764e963f736a6735a0a1cd6ae817cc17f7050899cd5919f11866f1a97c5cf1ee71f3ed0f023b9e547d9765bf5594f1478f5686449 -EBUILD aview-1.3.0_rc1-r3.ebuild 797 BLAKE2B 92753bfee226b1ab02f967b79630d7b50414d1287fe6240bf2ded478602d53c4c04363ef5051bbb8c0ce08774028475d1bb49357c867ec502d3c6ef51f9bc5fb SHA512 ebf8304bed3b79d21e214501f43ebe095124b5af606c826f4de0cf0479db3da8a47e7d96fe14eaa717f251dcc0000c88d056de2e08cca33cceb14234c32ef7bd +EBUILD aview-1.3.0_rc1-r3.ebuild 795 BLAKE2B c5555997150e6ced634ebf32f6b98614edbefad00a26154c5331ef4a7d3e160f88853930c58f77fb85fda25b27c65aff00a9d882d4e832abfe9774522d50203b SHA512 8d627352973103e17ccf063302ce96bb772b1c0453326a3783281757222cb9eb2956b4b07da23964d6fad06ac9961f590be021e9910cc0fbcfe61932c7071796 MISC metadata.xml 252 BLAKE2B e7a66be557802d7ca467631d022e882e2985f5d724603ca154106cc8ac13a6c13bb9d2c9d69cfc68871ec9473dc93e883e62d6463496d5ce8987546dfe2afeb3 SHA512 bd3eef9d63a167ed485cb156ca81b53649a9ed2bd4fbaf3f58328cadb09f5b4b65b2343a6f032b7540c445a98bb6c3abb3084f91dc1cf78ecfe9a067732e4385 diff --git a/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild b/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild deleted file mode 100644 index d7700f082355..000000000000 --- a/media-gfx/aview/aview-1.3.0_rc1-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit base - -MY_P=${P/_/} -S=${WORKDIR}/${MY_P/rc*/} -DESCRIPTION="An ASCII Image Viewer" -SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz" -HOMEPAGE="http://aa-project.sourceforge.net/aview/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" -IUSE="" - -DEPEND=">=media-libs/aalib-1.4_rc4" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-filename-spaces.patch - "${FILESDIR}"/${P}-tmp_creation.patch - "${FILESDIR}"/${P}-includes.patch -) - -src_compile() { - econf || die - make aview || die -} - -src_install() { - into /usr - dobin aview asciiview - - doman *.1 - dodoc ANNOUNCE ChangeLog README TODO -} diff --git a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild index 938ed7cb773a..4487794334ea 100644 --- a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild +++ b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://aa-project.sourceforge.net/aview/" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="" DEPEND=">=media-libs/aalib-1.4_rc4" diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch b/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch deleted file mode 100644 index e42ed0d5c583..000000000000 --- a/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -ur aview-1.3.0-orig/asciiview aview-1.3.0/asciiview ---- aview-1.3.0-orig/asciiview 2005-08-15 21:20:16.000000000 -0400 -+++ aview-1.3.0/asciiview 2005-08-15 21:20:19.000000000 -0400 -@@ -7,9 +7,9 @@ - } - myconvert() - { -- if anytopnm $1 >/tmp/aview$$.pgm 2>/dev/null ; then -+ if anytopnm "$1" >/tmp/aview$$.pgm 2>/dev/null ; then - exit -- elif convert -colorspace gray $1 pgm:- 2>/dev/null ; then -+ elif convert -colorspace gray "$1" pgm:- 2>/dev/null ; then - exit - fi - echo "Failed to convert file format to PNM by both convert and anytopnm" >&2 -@@ -44,8 +44,13 @@ - options="$options $1" - shift - ;; -- *) -- filenames="$filenames $1" -+ *) -+ if [ "$filenames" = "" ] -+ then -+ filenames=$1 #avoid leading null -+ else -+ filenames=$(echo -e "$filenames\000$1") -+ fi - shift - ;; - esac -@@ -53,15 +58,16 @@ - trap clear 0 - mkfifo /tmp/aview$$.pgm - outfile=/tmp/aview$$.pgm --for name in $filenames ; do --if test -r $name ; then --case $name in -+IFS=$(echo -e "\000") -+echo $filenames | while read name; do -+if test -r "$name" ; then -+case "$name" in - *.fli | *.lfc | *.flic ) - PATH="$PATH:." -- aaflip $options $name -+ aaflip $options "$name" - ;; - *) -- myconvert $name >/tmp/aview$$.pgm & -+ myconvert "$name" >/tmp/aview$$.pgm & - pid=$! - PATH="$PATH:." - aview $options /tmp/aview$$.pgm diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-tmp_creation.patch b/media-gfx/aview/files/aview-1.3.0_rc1-tmp_creation.patch deleted file mode 100644 index f792e8bfebbb..000000000000 --- a/media-gfx/aview/files/aview-1.3.0_rc1-tmp_creation.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fix insecure temporary file creation, see: -https://bugs.gentoo.org/show_bug.cgi?id=235808 - -Index: aview-1.3.0/asciiview -=================================================================== ---- aview-1.3.0.orig/asciiview -+++ aview-1.3.0/asciiview -@@ -3,11 +3,11 @@ - clear() - { - kill $! 2>/dev/null -- rm -f /tmp/aview$$.pgm 2>/dev/null -+ rm -rf $tmpdir 2>/dev/null - } - myconvert() - { -- if anytopnm "$1" >/tmp/aview$$.pgm 2>/dev/null ; then -+ if anytopnm "$1" >"$2" 2>/dev/null ; then - exit - elif convert -colorspace gray "$1" pgm:- 2>/dev/null ; then - exit -@@ -56,8 +56,9 @@ while [ "$1" != "" ]; do - esac - done - trap clear 0 --mkfifo /tmp/aview$$.pgm --outfile=/tmp/aview$$.pgm -+tmpdir=`mktemp -t -d` -+outfile=$tmpdir/aview.pgm -+mkfifo $outfile - IFS=$(echo -e "\000") - echo $filenames | while read name; do - if test -r "$name" ; then -@@ -67,10 +68,10 @@ case "$name" in - aaflip $options "$name" - ;; - *) -- myconvert "$name" >/tmp/aview$$.pgm & -+ myconvert "$name" "$outfile" >"$outfile" & - pid=$! - PATH="$PATH:." -- aview $options /tmp/aview$$.pgm -+ aview $options $outfile - kill $pid 2>/dev/null - esac - else diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index 33922d73ba71..e80923f09a22 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -5,9 +5,10 @@ DIST darktable-2.4.4.tar.xz 3432268 BLAKE2B 75d22187c4a32eaf240803e68b8ffe9a29b4 DIST darktable-2.6.0.tar.xz 3358508 BLAKE2B 1d6dc414d0f5c7dc1340ce1db229e5f4629534e6ccc3d4f017dea87a1e33d897ee8d73affece22311bbb27338075e48384b86b9aece83cbd6c582f761226a863 SHA512 066a8766edf3d961b2995bd681c9be65ae118f650a34da3c87c9096b76586c4a949b4c620993bcba3e7cd29f255c19dad9c2e205ed413c309398b4bc606eb73b DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20 DIST darktable-usermanual-2.4.0.pdf 15072726 BLAKE2B a10fb02bb732040e45e4b2c6b6a6e022c6095a29aac894727c8a803bf76ac50924bcd938f3c7085222f32542074cbe051afe8752059a0796db22adabecce3faf SHA512 0259ccd264ec0569a770d92a517932bf5b24ce279c699a636f36656519c400456f0bdbd5de1eacf96e0cb05c0b7e59a6c6fa02803b809bc0fabb902ffe454dd1 +DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14 EBUILD darktable-2.2.5.ebuild 3856 BLAKE2B 01adcaf0ca198b5cea7c49b5dc3844c76a7f0a0a1c83e1a9729161721aa73b390971156bb3784ec4d9c7577821da90390b5bdd1c3c3820976963d45fab510187 SHA512 daf6de876de7db156d979292562411581f06e58f8bddf5b3cb96f75c4b8d38f7dd8ac951c275192ce5d6f5f139566492aa7c08238e35da131a056113c08d9a94 EBUILD darktable-2.4.3.ebuild 3998 BLAKE2B ab0356bea66039573ec818f3f93670cee2728230e71e07e9f4acbb89e369971112ecb8cc9186b0235847619d583dbd61edcf287c03ade0eee484d93df2f817f5 SHA512 3a33ecadd7229bce3c2645fe37ad8673a3c68ac3c071c87173206753701703819f6e1ad2e3ed07f822356fa0b0bcde70b9988a9c8e0f3705749424e7cf878079 EBUILD darktable-2.4.4.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307 -EBUILD darktable-2.6.0.ebuild 3981 BLAKE2B a8dbadf93a0040703484e6b26c928bf102c4fa0f1139725efbe0caabb91efcf8408bee170f31c37aab8bee673312f54832b33dfcadb9fe273cba2471a53994b6 SHA512 4b3d972502223ac711a8d08142b0d05780306084ec156e788b3f7c2cf8b6c2c72b1b4b62cd0077939725a48cbb128cb56c0c809d472f978830a64cbe1c843ff9 -EBUILD darktable-9999.ebuild 3434 BLAKE2B 9720e4706e25b09ef6b0a652cdd2ee47fdc394fee8a7a8f3a673c8393a081e1a87b136cd6da813ca59aa4c6c6da6930ffcaead9123cf768765eb276cfc8134ab SHA512 99476f1f3742d2404bc491e3fe654e4928b714429070fc338461db8f49c2cc51c089f9426aad1470c65dd606054a90a6d69e8c52deb83e39bc0a298393bf6111 +EBUILD darktable-2.6.0.ebuild 3812 BLAKE2B 1385ece8bd15d05c952d35d3d66745ab48eb112c8a5d06c76d54e68af0982ee1a1a60140f9dc8c408c376d0943ca9f42dc0fe78512af3df0da69f75ada994555 SHA512 a973df309f430724d8dfa81ef372d7d19ad963ca442fe343b8e758c6704bcb49aedb4b5908ba0876359b31175941939cdad0f01132d278402e246762bdd0ef77 +EBUILD darktable-9999.ebuild 3212 BLAKE2B 091af0fd15369c39bee3d1cf075f552ecb5f048a2db4f620438a2a9f57ef0939e4e2e17eb6ea3ac4e174d28b2bc11c23358843a1dcd682d273c33ac3a11a5f62 SHA512 92d9be516d34c3b40f55186b58bbedcb94b020806e71ea2e3c1f68f275dc0e06b2aa42d3d3968e8fd0273e9718f1be336a62bfa3cc8ec460459d2aa81f62f145 MISC metadata.xml 871 BLAKE2B 5576cc42a46ae48d681043c22cbf206855a0770f112e42138a264950235b1af96751740800f8d9402bf5e00adf725511e557f3b65ec355abbe26de451ad5b70c SHA512 330c5e8b17daee39f3152fbcaed1979814b3b5d0aa205860e5ff309ae068037da0f4190f91672be17c138fcda91890954b2cd310b3725bada6f3916a73cebf1a diff --git a/media-gfx/darktable/darktable-2.6.0.ebuild b/media-gfx/darktable/darktable-2.6.0.ebuild index ffb8b344bd5f..741a54b7187c 100644 --- a/media-gfx/darktable/darktable-2.6.0.ebuild +++ b/media-gfx/darktable/darktable-2.6.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils +inherit cmake-utils flag-o-matic pax-utils toolchain-funcs xdg -DOC_PV="2.4.0" +DOC_PV="2.6.0" MY_PV="${PV/_/}" MY_P="${P/_/.}" @@ -26,7 +26,12 @@ ${LANGS// / l10n_}" # sse3 support is required to build darktable REQUIRED_USE="cpu_flags_x86_sse3" -CDEPEND=" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" +COMMON_DEPEND=" dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 @@ -54,17 +59,17 @@ CDEPEND=" jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) - webp? ( media-libs/libwebp:0= )" -RDEPEND="${CDEPEND} - kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )" -DEPEND="${CDEPEND} - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext ) + webp? ( media-libs/libwebp:0= ) +" +DEPEND="${COMMON_DEPEND} opencl? ( >=sys-devel/clang-4 >=sys-devel/llvm-4 - )" + ) +" +RDEPEND="${COMMON_DEPEND} + kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 ) +" PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch ) @@ -85,7 +90,6 @@ src_prepare() { src_configure() { local mycmakeargs=( -DBUILD_PRINT=$(usex cups) - -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" -DCUSTOM_CFLAGS=ON -DUSE_CAMERA_SUPPORT=$(usex gphoto2) -DUSE_COLORD=$(usex colord) @@ -111,7 +115,9 @@ src_install() { use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf for lang in ${LANGS} ; do - use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_} + if ! use l10n_${lang}; then + rm -r "${ED}"/usr/share/locale/${lang/-/_} || die + fi done if use pax_kernel && use opencl ; then @@ -124,13 +130,8 @@ src_install() { fi } -pkg_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postinst elog "when updating from the currently stable 1.6 series," elog "please bear in mind that your edits will be preserved during this process," @@ -138,8 +139,3 @@ pkg_postinst() { echo ewarn "It will not be possible to downgrade!" } - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild index ea7f114839a9..dce04128d375 100644 --- a/media-gfx/darktable/darktable-9999.ebuild +++ b/media-gfx/darktable/darktable-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils eutils flag-o-matic git-r3 gnome2-utils pax-utils toolchain-funcs versionator xdg-utils +inherit cmake-utils flag-o-matic git-r3 pax-utils toolchain-funcs xdg EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git" @@ -22,7 +22,12 @@ ${LANGS// / l10n_}" # sse3 support is required to build darktable REQUIRED_USE="cpu_flags_x86_sse3" -CDEPEND=" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" +COMMON_DEPEND=" dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 @@ -50,17 +55,17 @@ CDEPEND=" jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) - webp? ( media-libs/libwebp:0= )" -RDEPEND="${CDEPEND} - kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )" -DEPEND="${CDEPEND} - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext ) + webp? ( media-libs/libwebp:0= ) +" +DEPEND="${COMMON_DEPEND} opencl? ( >=sys-devel/clang-4 >=sys-devel/llvm-4 - )" + ) +" +RDEPEND="${COMMON_DEPEND} + kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 ) +" pkg_pretend() { if use openmp ; then @@ -77,7 +82,6 @@ src_prepare() { src_configure() { local mycmakeargs=( -DBUILD_PRINT=$(usex cups) - -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" -DCUSTOM_CFLAGS=ON -DUSE_CAMERA_SUPPORT=$(usex gphoto2) -DUSE_COLORD=$(usex colord) @@ -103,7 +107,9 @@ src_install() { use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf for lang in ${LANGS} ; do - use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_} + if ! use l10n_${lang}; then + rm -r "${ED}"/usr/share/locale/${lang/-/_} || die + fi done if use pax_kernel && use opencl ; then @@ -115,17 +121,3 @@ src_install() { eqawarn "please open a bug." fi } - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 0fc1b16ddb9d..fa036a378837 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,5 +1,5 @@ DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb SHA512 f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63 -DIST digikam-6.0.0-beta3.tar.xz 326340364 BLAKE2B ea43fcf6047a0ee9de824f91a88d49bf61e86cf77255aecec7e1761319d6d6bfbc8b8251f18594848ddaec27b6b50425b01e1d6da24859986a5b5050670a037e SHA512 4e0ee5406789618644b6af7316b922785b0cddc6ff3d5d972da1d88b5cd3fc6df8b2ccb63d65d7b61a5adff86e25a79a5075cb65302e99e5d3b522aa32fcb68e +DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B 93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba SHA512 b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb EBUILD digikam-5.9.0.ebuild 4758 BLAKE2B 89cb7574f20f3cd08697386b6a0cc25a6bec270062a23d68afe1148c631980f8fe9cde76d5ebf9fc129eafba06dc96c25d92614e3422abc5140d7a0f2364f576 SHA512 f758f3dfb93c15721d27cb6242779a358dbe86b976d84fb5fe7796c959d757dfc9efedecfb344df17eaf0869d5fbab1169d1bcf34cf45c68e8422caf48ccaa6c -EBUILD digikam-6.0.0_beta3.ebuild 3885 BLAKE2B b64b6418f2abe65883904d17f44855bc3a3cac42b3d28d4c99101f503d90bd935527d0f939e805637bf718ef30f1c9d62cdd4ba88b004a6e9406c2fd76623c5b SHA512 07d94b8b9d16fe32a6f7028d05946b58b3c249cffa47f6a24e2c373469971dd6459ccc43d94c5f9936f0dc89d4f4fae28742b6ad470dce0f7805c7b0e2a7d911 +EBUILD digikam-6.0.0.ebuild 3838 BLAKE2B f47ca56ae55f11b3a488ff2c5ba2e29892d789b4c965628c6c06782ff9843e26575c3de2353a8e25a882ea95e6a133d0c2bfeda8b6eb7b60c16572e5c4556512 SHA512 3559ac4f170b8588c28ba620373708519169d8ffbd5022ab7baddb162b6dc3a17eac293ca8f8979c28b03717b44cbab67703bac1deed5d8e9d99a94c976244dd MISC metadata.xml 1166 BLAKE2B 0844b599bbb92d64c88ed1d4d32ffec17f71912d8736e8f6cd5829a662be59886f52ae57c3de2eb3c36c3de252d6ff9868dddff30d212f7ae7cef36775c46ec0 SHA512 41741282ed42fa5bb9ff644d0dc3cf021daaf4904d8811fe5f3e37e909432e86c489f0c1843b547f70790acdbc74163de133f078722f8c33fffd389d870d4367 diff --git a/media-gfx/digikam/digikam-6.0.0_beta3.ebuild b/media-gfx/digikam/digikam-6.0.0.ebuild index 48c1135b4fe0..1ed43c3ed62c 100644 --- a/media-gfx/digikam/digikam-6.0.0_beta3.ebuild +++ b/media-gfx/digikam/digikam-6.0.0.ebuild @@ -1,30 +1,33 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -if [[ ${KDE_BUILD_TYPE} != live ]]; then - KDE_HANDBOOK="true" - KDE_TEST="true" -fi inherit kde5 toolchain-funcs -DESCRIPTION="Digital photo management application" -HOMEPAGE="https://www.digikam.org/" - -LICENSE="GPL-2" -IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" - if [[ ${KDE_BUILD_TYPE} != live ]]; then - KEYWORDS="~amd64 ~x86" MY_PV=${PV/_/-} MY_P=${PN}-${MY_PV} SRC_BRANCH=stable [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable - SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz" + SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_P}" fi +DESCRIPTION="Digital photo management application" +HOMEPAGE="https://www.digikam.org/" + +LICENSE="GPL-2" +IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" + +BDEPEND=" + sys-devel/gettext + panorama? ( + sys-devel/bison + sys-devel/flex + ) +" COMMON_DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -83,7 +86,7 @@ COMMON_DEPEND=" semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) vkontakte? ( net-libs/libkvkontakte:5 ) !webkit? ( $(add_qt_dep qtwebengine 'widgets') ) - webkit? ( $(add_qt_dep qtwebkit) ) + webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) X? ( $(add_qt_dep qtx11extras) x11-libs/libX11 @@ -92,11 +95,6 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} dev-cpp/eigen:3 dev-libs/boost[threads] - sys-devel/gettext - panorama? ( - sys-devel/bison - sys-devel/flex - ) " RDEPEND="${COMMON_DEPEND} mysql? ( virtual/mysql[server] ) diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 317a1c92cc1e..b22963cc3d69 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -6,5 +6,5 @@ AUX exiv2-0.27.0-png-broken-icc-profile.patch 1699 BLAKE2B e9d019d3d885198e9945a DIST exiv2-0.26_p20180811d.tar.xz 1722216 BLAKE2B 9e1c8307eb923c340894c82c37e9f6c31d82ff1b1de3c79d4ec9b0ec9428ad1d05f945e9a4e440028335857e7fc32d50cdc5245842d743e017037bd641b654db SHA512 5453650888440028acb139a02b387eab0232551c97256ce88dd626fa4cc8800ec02ad66e093c314bbfdc60726995b6c8482572d1ffaec73a265209c98c901780 DIST exiv2-0.27.0a-Source.tar.gz 27168207 BLAKE2B 3f5c4fbe4f41c1114c0a54433c810ed0fb28ae3fbe8258eb7a02da716b833d62a94725f839accf22600c420ace5cdbead599440d335ff694a4f123820613ecd9 SHA512 9873d6815c2a87b7cdc49e8863f72c713fe1054f2f46d2c9aaa7ca2cd42096a36c2970e6a396af9000faba32fa9ff054b9d2c5e22f3e2624669440e553239f9c EBUILD exiv2-0.26_p20180811-r3.ebuild 2954 BLAKE2B 06ad8b544150e1f5d4f1a305d78ab3ff7772b7c797e67e47ce01a233d0afee514d7660921c33b43634da60883b2adba119a80830c2493ad01800bd9b05b34072 SHA512 172e65b6210cb383afee4f344d585fae40dc7af1b7bb5d8dd2e5acbd7fcb4086b4caca998ce3627aefb4be3f8e4cebcaef24ccfb67d61d580b674fee50b24627 -EBUILD exiv2-0.27.0-r2.ebuild 2546 BLAKE2B c9df6fb158888f6679752a53c879286826b1909cc379a11dce9afeff79996f6058dc4e4c09ca41aa039e3f9216991cd7f25d40e5133082dd5f98b8fac82c0afb SHA512 82cffc6d9ef156235d9cecca24ba40ac70db2469cbb0bae7553859f5b148e07d25cf71be23a472921b4e4476c5a84d05ddd4078603bacdcf4922128fc7566f25 +EBUILD exiv2-0.27.0-r2.ebuild 2543 BLAKE2B a98a1c1a02a040b76a4578fa3f5b7373307c425ff06d747f0d51d3cd940cec575fca696813cc465ab27e8a3112dee3e92cc2e0443483fbe4f2bd6b76ac665fc5 SHA512 6a1d7dec64413a851f9bbf04cd188867b636b13a3d69814ca92f8732ace686a08e96a510bc0f6f21e33f73d248d958ec800c63a5bc287312b8a51d384531c26a MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5 diff --git a/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild b/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild index 6d90c6320e98..44c5d08970a0 100644 --- a/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild +++ b/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} = *9999 ]]; then inherit git-r3 else SRC_URI="http://exiv2.dyndns.org/builds/${P}a-Source.tar.gz" - KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" + KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" fi PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest index d10c74976a2c..d0551297da11 100644 --- a/media-gfx/feh/Manifest +++ b/media-gfx/feh/Manifest @@ -4,9 +4,11 @@ DIST feh-2.26.4.tar.bz2 2132124 BLAKE2B 962af7b7e806a8cea570c1512c377b0eb9ca9924 DIST feh-2.27.tar.bz2 2131975 BLAKE2B 84100beaff26454c8d33a479171b1b59402b74d04860192e5e826dcac93a288b095afee6f0676b56eae0d1f8dd3c4998767d0cd196ffd3b6a5406f5c1e6eb1d9 SHA512 6d9cf38e9b40291f6e7145705057a2c945b720b22d85020e265c2a158d5e4ca68cca958e2fae3d01a91bb4b2c52ebb5d2c298c41bf8ff3e4f635af7c006d0cc7 DIST feh-2.28.tar.bz2 2132687 BLAKE2B 92e428250a7fc01b5ecc8783d1a0f325ab168935eb6533a5726681389c05f662d9f7b978a50c2f1ef4d5cfd6f356e758cfff781072143902dbdab41f2310b705 SHA512 565a5aa0ce1c29fb2f09995283dbf2e12e0f228294df7c1b744a545e4f550126e0b327e9903c9eb35cb7dbd96d69e4653c57f3b3cb2dc2475680b3c62b71e1d8 DIST feh-3.1.1.tar.bz2 2109534 BLAKE2B ea02ab09791ef61a9ac5db84b5a0f69ddc76f994343660cf4072a41769a59ddd2936e0f047eeed26be0b3676711b1e440c0483325e6bb621205788ebe13c1fca SHA512 cbdf6e36831a750a6bdb9f1a5735c814662b5274d9c453392de88b98926b539cc54e2041fc0cd2a393762f14ec24b81435de6d506d9efc1ee4c7d80105aa6243 +DIST feh-3.1.2.tar.bz2 2109860 BLAKE2B eb3c4b0d93a6b18477626d1cf4d99fa96e0ccd2bd21ad646ef7afa31c5f9e318c7b20eca2615f13d537806caee16a7ae6f789ebdf2dc3eb7b53ba8824e807333 SHA512 a81ee5d8d0ac3ce13cfc5af6e1f5854235755ea54dd92a1019ff206617f1c46196a5e3a0794bbc886e89854b221f99b6e3fe387fa7d50bb0cbc3a2d9e834bbbc EBUILD feh-2.18.3.ebuild 1194 BLAKE2B a9ba56ee28f45ba475db7373f3caf7534fb9cb1e020b85b6f4fa19fecd00cd23c493d862b662639e73cd2e9b38bc8703e42a36107e26cee636b0ad871b1d6990 SHA512 f23c472d2686a21fb3c81111415682d059a121eb5e0a14a6a71298395407e3aea0f5a16b9d91ca8c46c2e7a1ce455656832863ba63de2a142e056dac132e7346 EBUILD feh-2.26.4.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69 EBUILD feh-2.27.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69 EBUILD feh-2.28.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69 -EBUILD feh-3.1.1.ebuild 1467 BLAKE2B 4bb9b78432c0c676343bc23d4c2dace66e5e5cd25fcb85d68579efeacd28708337dc4e7ffed4a5867fc5044057948dbe8022fd7ce4866811230d98f15073bea0 SHA512 804f9c3b2e22fe0418488079aff2e4d17ed464c09229357a36763bd0213d9ef98f98ffd2c9461e3f86b1dd829f1617f0ab3fb0928c8e96f95a623351815fd0df +EBUILD feh-3.1.1.ebuild 1466 BLAKE2B 255d6fb69535b31a1775c5be3779e72550c03ddf67f77c22bd237ee468bfc85f9eca7641d1f1a8ef051c2c8172dd8c8e6b1ffefef065c86b72ea665fa2ab5c85 SHA512 b240119bbc8adede6ca0232770d755f00ed0fa37eca2984defe148cb3fa28cb6e61bb075eb18407dca7b3b3a01e68a9289d5cea9d759b419040dab714736bd14 +EBUILD feh-3.1.2.ebuild 1467 BLAKE2B 39c5f81f461a816de37e2bbdbb1b4aab6beca6c285981db80922d82b728a0ef539268d845b17c0413774fd7cc3d9e6019559d6c0949266f34521773b22d0dece SHA512 fca2377658182715b3d0c139a75a35e9ff834ec3ce8e813666f229178f033a9614f29cc0d2992dbb594a008d6cb07233928382b17496bf545ec87a48cc68e550 MISC metadata.xml 358 BLAKE2B 602fb8b872f5f209abd20adbb141035c0d0396a7712839c950cfa19e78201c0c39e88fa5e8bebc6224459bb8e328e732ff30db848f6c84510f91830951f2087c SHA512 51fad9cc41f31b03f42e0ac4254ea05a848df755091cdd47ee4ce73f7189acd83e8956c230329ea0053d1f794b529e498525f6ce282a947c9809c4954a5b9a19 diff --git a/media-gfx/feh/feh-3.1.1.ebuild b/media-gfx/feh/feh-3.1.1.ebuild index 182155399da3..461f8261e5f2 100644 --- a/media-gfx/feh/feh-3.1.1.ebuild +++ b/media-gfx/feh/feh-3.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2" LICENSE="feh" SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~mips ~ppc ppc64 ~x86" IUSE="debug curl exif test xinerama" COMMON_DEPEND="media-libs/imlib2[X] diff --git a/media-gfx/feh/feh-3.1.2.ebuild b/media-gfx/feh/feh-3.1.2.ebuild new file mode 100644 index 000000000000..06c60d87c45b --- /dev/null +++ b/media-gfx/feh/feh-3.1.2.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit toolchain-funcs gnome2-utils xdg-utils + +DESCRIPTION="A fast, lightweight imageviewer using imlib2" +HOMEPAGE="https://feh.finalrewind.org/" +SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2" + +LICENSE="feh" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +IUSE="debug curl exif test xinerama" + +COMMON_DEPEND="media-libs/imlib2[X] + >=media-libs/libpng-1.2:0= + x11-libs/libX11 + curl? ( net-misc/curl ) + exif? ( media-libs/libexif ) + xinerama? ( x11-libs/libXinerama )" +RDEPEND="${COMMON_DEPEND} + virtual/jpeg:0" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto + x11-libs/libXt + test? ( + >=dev-lang/perl-5.10 + dev-perl/Test-Command + )" + +PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch ) + +pkg_setup() { + use_feh() { usex $1 1 0; } + + fehopts=( + DESTDIR="${D}" + PREFIX="${EPREFIX}"/usr + doc_dir='${main_dir}'/share/doc/${PF} + example_dir='${main_dir}'/share/doc/${PF}/examples + curl=$(use_feh curl) + debug=$(use_feh debug) + xinerama=$(use_feh xinerama) + exif=$(use_feh exif) + ) +} + +src_compile() { + tc-export CC + emake "${fehopts[@]}" +} + +src_install() { + emake "${fehopts[@]}" install +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest index 367d176de9a9..08d89d66bbb0 100644 --- a/media-gfx/gnome-photos/Manifest +++ b/media-gfx/gnome-photos/Manifest @@ -2,5 +2,5 @@ AUX 3.26.4-support-tracker1.patch 1094 BLAKE2B 224f4052fe379d79ca9fa02dc0d7e1919 DIST gnome-photos-3.24.6.tar.xz 986200 BLAKE2B 656737326f594958ea1cc956f85e50c7eaebc227491d95342acab9a1fa0e3c5c109efe932cd0465e48ada62beab238e6eef0e01033b145de72a1fb64ce2f3c89 SHA512 47fd858b643fe0bca9a4801d43bd7eb181db08d7e09941a60a134247df97b0e900cd062efef70da5161a9fceb1d33b998b87ad5eca0a5937a10c4e06b908de22 DIST gnome-photos-3.26.4.tar.xz 1101324 BLAKE2B 81e851bdeb39455cad6d4ba99194229507a809c3bd8c9ff0c24992cbbf90001d87f96d1c2b3c3a07101982e6ea169cba0e2249431138e962850f55fffc2c54ec SHA512 0a49b7eb29918ccf87af4211db6ffbb3c55ab40f4eaa1437317fda32de43b3b0c9033397d5b06fbc5012d0fa322a79dafdf46817cfaea57ef2f4df1a975fb489 EBUILD gnome-photos-3.24.6.ebuild 1794 BLAKE2B dce8b2a44345c35c19058389cfa48d0e9f4e50f427e7d5406e09515598a13c6569b886cdf8e6effcaa9d87ad2ea693596ab49aaa6d8eb9ac930b28749bc6f1a3 SHA512 0a27e45dbdb2adfa84a8eb389a8342a9fa58f5d98d0142c1ab4817f7c2e5f247b7702968190947ad25db6ed1f7fe3a91be9683c5f57010600a2a890b8ca84975 -EBUILD gnome-photos-3.26.4.ebuild 2091 BLAKE2B c2ac7aaa7231118d8f1540882cb364446c2d8d4f0156c27edb0b869ff4f6f45b17ded79e9215af3022e3cb8598d7cdd6b9d05f63631fa104ff3d637d77a8e910 SHA512 257385a4c296d47f7d6e38c33720e539b403c5108ca2e736d0f6a4a70a272ec0a09a830593749cb986dcd96103fdc366220d83b4c50edc00fc24e9a0c68108f2 +EBUILD gnome-photos-3.26.4.ebuild 2062 BLAKE2B a5f08ee546de0a51cbfd74c812c320f22ab9a2c3b131693ade2049ae53cda83b669e945bc557be3c24af4f205020176ce733e75cde78f4ea830fc31920c9707b SHA512 3da683b6f4ffabcbf9420751a2d99f94cd0f8f5960069a3a4cb25d9d9195fd90d8b11d498e3c305a6c36917675fe09934d38705c99bca11e6a2deb3db543fb05 MISC metadata.xml 320 BLAKE2B b66fb85cefaafccf9575d4f85c017cc07cb55b75d377e8a95bf482b6cb7817f902c5fd3987e08c3d77b604f10710cb6f9820f5e4451e402b186e7714444abf4a SHA512 86c99b12ed97b3f09e9469dcb093e18f844f5b3efb3a3169e62e10fe446075c7839ba7ca00e3537744d3c839522cf5ed2ee33215cd5988466e35d0f4dd739b11 diff --git a/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild b/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild index e2c8b5c05442..f34fc89fd7ac 100644 --- a/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild +++ b/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild @@ -15,9 +15,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="flickr test upnp-av" -# tracker-2 is supported, but we need to pull in tracker-miners for that, which we didn't have in main tree yet COMMON_DEPEND=" - app-misc/tracker:0/100[miner-fs] + app-misc/tracker:= >=dev-libs/glib-2.44:2 gnome-base/gsettings-desktop-schemas >=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts] @@ -50,6 +49,12 @@ DEPEND="${COMMON_DEPEND} test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') ) " # app-text/yelp-tools needed for eautoreconf; otherwise probably just itstool +RDEPEND="${RDEPEND} + || ( + >=app-misc/tracker-1[miner-fs(-)] + >=app-misc/tracker-miners-2 + ) +" PATCHES=( "${FILESDIR}"/${PV}-support-tracker1.patch # requires eautoreconf diff --git a/media-gfx/jigl/Manifest b/media-gfx/jigl/Manifest index fef44602aebc..92a7d90142fd 100644 --- a/media-gfx/jigl/Manifest +++ b/media-gfx/jigl/Manifest @@ -1,4 +1,4 @@ DIST jigl-2.0.1.tar.gz 35423 BLAKE2B 598371156095a75e20c175dbdb50fd7207d72827f24839c456b96308e876a2d0438ad1191e831efd61d6a62704ab2315c26b2c5c83bc14c5a797eea985da8e07 SHA512 648d00d5c6b57ade66da388dc6168289260006f08f971b9a353529191c06357604a341df371c9638762ad3232efc275cd685c2c3c258472c8503742113c41e77 -EBUILD jigl-2.0.1-r1.ebuild 451 BLAKE2B cdd329dc3317deac3bfb3a425692b48254c8a1071d925a429201dcc4c5e919bd8a4707efb3ac90e2320bc2d8f40647952e0cb37036bc94fd035d130a1c22dd91 SHA512 c729d07b9c30096aabcfcd4ff3c82761262ffe656a9e9cf578d45c11679f9d362656a5c266413876d1e7d98a30b0f944b90cc8763040e18703e2fd380207c6ff +EBUILD jigl-2.0.1-r1.ebuild 450 BLAKE2B 2dd6384f6419539041fd2a863fb134490dccc8bc5081449941a35d7d18a6d867e18e678ef16894feb7b6a2abaeaf7a979512385c852430001fe2996ef781ba3a SHA512 99d76a905385a281e8a4bc7120656ee36a01366430f0d6abad4e6dc6a3a885a07c7c4e41cc758b475312923d7c623f7292a19f31afbdd28b403f2e373d2b230d EBUILD jigl-2.0.1.ebuild 452 BLAKE2B c82dccfddebcfbbda12b57113baeeb42125956af90a2d213183500d375dcdaa581c0a5007967ba4bb4a69c474d1026399b6e71f81b0b35620cea2133186c13e4 SHA512 9c705745ecce1148eae2d8f608facf77491fdbf39618f4753fbbfef9145ad7a351231126a014183ea68f5308404a8bc11d4a7f64951e3348061118714e6eb69a MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf diff --git a/media-gfx/jigl/jigl-2.0.1-r1.ebuild b/media-gfx/jigl/jigl-2.0.1-r1.ebuild index 64125ecee7e1..0a04ec946b29 100644 --- a/media-gfx/jigl/jigl-2.0.1-r1.ebuild +++ b/media-gfx/jigl/jigl-2.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://xome.net/projects/jigl/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="" RDEPEND=" diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest index a472c708dbfc..061639dea310 100644 --- a/media-gfx/kphotoalbum/Manifest +++ b/media-gfx/kphotoalbum/Manifest @@ -1,6 +1,4 @@ AUX kphotoalbum-5.4-exiv2-0.27.patch 1687 BLAKE2B b1d94b96200dc3e750e76c1e8567061ee6fa693478aa82556f24ef805365653eb90d72252b0a26d24b9b8a224f767ca56710e0d52701a71d82e41d3651e86d17 SHA512 768e7c1e31e4472dc304eae85bf8ba73bc590cd7817c486ae9051f0a25eb333f9054dea81187230b816381c6299e6bf374e1d6455db9b7d2532490b6f1f934f7 DIST kphotoalbum-5.4.2.tar.xz 11807452 BLAKE2B 45ecdb4fbe3d66770394751911201737b698d2d497bb387871755113d153ef2c01a9b7e4a101f2b465d79801d0f88f084a0d0832550591012b44c70e5b28ff7f SHA512 9a4548141c56dd6426244e646a0d2bfb2eac28797c63ae478a56d6b1c0484ce5e607abcb079e50fcbc0643f7e9a94844a9af6600748ce465b8f66781aa5e3038 -DIST kphotoalbum-5.4.tar.xz 11658792 BLAKE2B 5f91dac910cc7022ca8a20f49f286a84586bf7adaed57448c1d811c370a9fb8661469d4e8e73809990e1e1800aaaff8f53c86446d93f99fd55cdddbece01eddc SHA512 d528905f3af9d23c89c89f902abe8358f8e90c402e437bc7cdd67837649f5dcd7f7416c77cc824532f928f41e7590f6005f13c97be4d608e433aad285a6a8bba -EBUILD kphotoalbum-5.4.2.ebuild 1578 BLAKE2B bfbc876f30b3abeb8cc7d569714cf3b3c905b5fa19eea79d1ebc1ac7ef53b3027a125e4adf80ffe301a3842d6a1be1ba3a17053e0b480b8f0f62e88c4f10e0c8 SHA512 3c3e0c853cba71da9b4f38f6ea846cceb83b00e069c87d7cefddeb2214905592b18b18877208cce53ed2108e202a069b762b060a0be3118b6d0a434b099c145b -EBUILD kphotoalbum-5.4.ebuild 1571 BLAKE2B 7699730f48c3f1d037a0349c444c3876eaf3accd0001954812778f18efa03de768753f8bb0c095ebe5ee6e09d302d5baec993b10ca0d18de2a7f1cfdccaf5b91 SHA512 7441a62ee268bab25149cc26b46fe9d636c2720c0fc56696181557e46813c7d30b921d48922bc4bed1d36b385f6109de92bb8e0894c94624104a6b66af8e10fa +EBUILD kphotoalbum-5.4.2.ebuild 1576 BLAKE2B 29430537ec49d17356232341a687a57bc2ac88e0307bf370a0deedab0b39ce41f377914c21c23c55913990eefd20d6a06b4c57172b81c6f5b8c5b0cbb0741cc4 SHA512 d2454c899ccaa1b85164b74d6e4080a48a21c1e24b351049c4ccf9278891878604a3d2bcae9e6dbbdf965fa02c7339c0a44502befcf7b385bc9e58f8c472092d MISC metadata.xml 424 BLAKE2B e5e77a618c93044474c0a049bfd37dddbddaaed85bf84fa2e5e7233064176032cc255dbce77607aceca20e431f43f98e29295c977e7841dc86b2c5b286c6df8e SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild index 4fe6263916b8..f2dda9ed28ed 100644 --- a/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild +++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://www.kphotoalbum.org/" SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2+ FDL-1.2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+kipi map +raw" DEPEND=" diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild deleted file mode 100644 index 6aaff0db9146..000000000000 --- a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="Tool for indexing, searching, and viewing images" -HOMEPAGE="https://www.kphotoalbum.org/" -SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+ FDL-1.2" -KEYWORDS="amd64 x86" -IUSE="+kipi map +raw" - -DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtsql 'sqlite') - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - media-gfx/exiv2:= - media-libs/phonon[qt5(+)] - virtual/jpeg:0 - kipi? ( $(add_kdeapps_dep libkipi) ) - map? ( $(add_kdeapps_dep libkgeomap) ) - raw? ( $(add_kdeapps_dep libkdcraw) ) -" -RDEPEND="${DEPEND} - || ( media-video/ffmpeg media-video/mplayer ) - kipi? ( media-plugins/kipi-plugins:5 ) - !media-gfx/kphotoalbum:4 -" - -DOCS=( ChangeLog README ) - -PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package kipi KF5Kipi) - $(cmake-utils_use_find_package map KF5KGeoMap) - $(cmake-utils_use_find_package raw KF5KDcraw) - ) - - kde5_src_configure -} diff --git a/media-gfx/mkgallery/Manifest b/media-gfx/mkgallery/Manifest index 1e38483b21fa..9ed3f9741f94 100644 --- a/media-gfx/mkgallery/Manifest +++ b/media-gfx/mkgallery/Manifest @@ -1,4 +1,4 @@ DIST mkgallery-1.1.tgz 6514 BLAKE2B 3ac077de99e2c8e05424425eb640a6684eb199c99d0eca879aab23645b392d3b19184d0a93e7dd4a92cd643d261c22a0677919e26b1866507c35d782ee6ec390 SHA512 6d3cbe6bbf3673c26bedde0eef1b03409766324836296205b6dab0a32eb23c7f8cbd27db2778bf710c7d3641e01eb57dbac5493ab97862cd501b3858f1db6a4d -EBUILD mkgallery-1.1-r1.ebuild 510 BLAKE2B 2852d3c8cc358c2eb4890a5ed412759e5755d5f88f1f81b587df3cbd4743fd516409f5ef049a317f082140e3475ca54551881fd6140ecb78e9575c03da51e4d8 SHA512 6fb0de5cfaf0f6eca6ad6d0d08f7ea64910b56b4925873164721a5414ac4093d51191e715d0b5ee76696d8890239faa0505f9505624408b2a808b73488bf2e87 +EBUILD mkgallery-1.1-r1.ebuild 509 BLAKE2B 30f0dbeeb9ae81a358edcd875b636c5275591bb2925f81c34533e086333b9ffface8a780afd5240c45dc9fb439633720a61ca5e6d0e5644aa41c46956b198143 SHA512 dc900e25bc9d738b2ecd8f920a208d70cefdeed2cbe30390d225fbe2d76c4f8ea495b0d8ea4a4e167b8d077b7575641d8e705b5301a424002620f8586550364b EBUILD mkgallery-1.1.ebuild 528 BLAKE2B a114ec974e314ca71f0a107eb040697874432358989f66fb947ace0efed2d7a33edd3917ed229d9f9bdb36673d498521f516db2226bc50105396c3c093f08235 SHA512 a4e141929b498c0de8dc896ae94797a8eaf72b4a2744aca6105030b479af7b31e7093541d9090054e057d1282780430c6fab7ec8575903748cbdbf3aa7dc3e82 MISC metadata.xml 246 BLAKE2B ae3650aa087620727ede47f5c455bcaf1c88078b720cc601aa399305760d957ab0ce54674ef2f3c0afc4e832637acd1f0758926c14ecbe22eb7c1c693235e46e SHA512 06b51a14b7a00428ccf8399b124bdf7ad7909af339489562a36e3e470da8c8cbdf09324fd01c14dd515ee0fb8d4849ef25f4117c56076a4590fd31b7f76b8651 diff --git a/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild b/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild index 07ba89fd748e..fe1eb4c05895 100644 --- a/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild +++ b/media-gfx/mkgallery/mkgallery-1.1-r1.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="http://mkgallery.sourceforge.net/" SRC_URI="http://mkgallery.sourceforge.net/${P}.tgz" LICENSE="GPL-2" -KEYWORDS="~amd64 ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" SLOT="0" diff --git a/media-gfx/nvidia-texture-tools/Manifest b/media-gfx/nvidia-texture-tools/Manifest index 9b42ad3ce052..d1b945c35738 100644 --- a/media-gfx/nvidia-texture-tools/Manifest +++ b/media-gfx/nvidia-texture-tools/Manifest @@ -6,6 +6,5 @@ AUX nvidia-texture-tools-2.0.8-gcc-4.7.patch 406 BLAKE2B 8c17ed5fd7158f118b450f8 AUX nvidia-texture-tools-2.0.8-openexr.patch 2558 BLAKE2B 55694c275548dd9177991e008fe9a9c37c290d4e8b17e4dd91a0ec241dc75900e4b6f29f8650780af112ebffcc7ca04c617456b5e2186e590f3e2da705960a1e SHA512 f17a4f009298c65a06e536a434033db9735b0574c3fc2225bde2c86841c1ad8b35c6d9f5988a98285eb9e7b2e9832e8c9495a1a36e3dcf398101b08d59e87ade DIST nvidia-texture-tools-2.0.8-1.tar.gz 935227 BLAKE2B aef1801795f6102ac7c96df236de0e8534bfacfc72d297ff3bcd13b530829e8848f33065477a1fb2ffaa35d75bd9e34913d3551469aa814cab8cb76f2f04e721 SHA512 8e7ac79daaa10a2b1b64cfc8d6b37b37698e2a46f925cc33cdfd8e4b36705db8836edec6f98c5d6da475d7773f4a5826b5cebc120b7c5a6f9515906e2e4fae9d DIST nvidia-texture-tools-2.0.8-patchset-1-r1.tar.xz 9604 BLAKE2B b93c9586688dd690668c9d57d533c3460b008cf357a202cc6dc315ab6d24cd3d796d8596024d193bdd9100fab52970b323f03dc16b4f72b3e551167bb46513b5 SHA512 988ea0731b7f98f804a715404fc8cb8a8956a6c6b795f0ce8570f800dac3319f222bac8f12ab6fde50bbec3d68926ed3b24516931f9aebe2a7ce0fcae0dc8e13 -EBUILD nvidia-texture-tools-2.0.8-r3.ebuild 1681 BLAKE2B 88fdd941f337ab64dcdf72d0b2fc3a7c32a15663184a95a2f5cd10ca3f5eb281a0f7659f8ac67981addf0378c4f8d23ac850cd6788db45463d013888cb11cab8 SHA512 1bf6962600946737990963fa96031984ebd2604c50d33c7d857053e89ef3e964d81595f23939784362f2c64d465ef80fccd8ca5594376f770830d79d836c0fff -EBUILD nvidia-texture-tools-2.0.8-r4.ebuild 1511 BLAKE2B a6e61a96f95a10b97b3e26d06bdaf77f557be92ac53392ed9681eeadc8a1591415ecd781a3c67cff1df9ee762b36b3dd9c2a47c6be2c5b6a5dbfab59930ca34b SHA512 45793be3ebafacf462b2c7697e44b2786a6f73788dcae7b3f3ac17633d11661a5121f127b3b22ebab11d039c2af23a22dbfb5fe8c47f29e1a403039e17e49719 -MISC metadata.xml 432 BLAKE2B 61cdc841e0492423330339399f620001ae3a7b176631dcfed14345e39bb02aaf28225bd5a469ad1da9341003a0a12f28d5dc0ed48bea94fc15c90711e56d0b27 SHA512 04ae34b58e838041211dfbb73bc88dd3f9d53f8eb6c8f8736e148790d5b3e50498c3e135c8333c37ca996378d0fc50d21b9e5ac8f7664cac868841fd66adbd0c +EBUILD nvidia-texture-tools-2.0.8-r4.ebuild 1506 BLAKE2B fa68fcb7198d50acf90bfe8973e1cb7e7a657dcbaadf65c35640de3d7b999259ca6771ed5de15a512bbf493076c9efc895c03d75a77a60cce7e31dfa76618fcd SHA512 f7e293b826a9a0e1b9993b5046ebcb2b44fe0008340fb4ad5ce00ed69fe693a6a60301b60829a9fe2b62f05f5d5b4fafa31735b767fea2d3f9f3abaa08641591 +MISC metadata.xml 370 BLAKE2B b516169c99bf0f8fd79fcb152c6dccc702b037f94483232fd3dee83d96f4a8b71abf82e19c72df9ebed4f95aabe8c26af44b0449961c31619e4e4ec474a69c78 SHA512 11a9aee676f6834be3333dc43e91d2c4980c65cba6d2fcbbb0a8c5d1eaea9e0ee78956905fed45724e465bdda93ce28d65c66de5b92be539a5f5f80afde924bc diff --git a/media-gfx/nvidia-texture-tools/metadata.xml b/media-gfx/nvidia-texture-tools/metadata.xml index 0d4c55828138..20324d728bf0 100644 --- a/media-gfx/nvidia-texture-tools/metadata.xml +++ b/media-gfx/nvidia-texture-tools/metadata.xml @@ -4,7 +4,6 @@ <!-- maintainer-needed --> <use> <flag name="cg">Enable NVIDIA C graphics compiler toolkit plug-in</flag> - <flag name="cuda">Enable NVIDIA CUDA toolkit support</flag> <flag name="glew">Enable support for The OpenGL Extension Wrangler Library (<pkg>media-libs/glew</pkg>)</flag> </use> </pkgmetadata> diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild deleted file mode 100644 index d8f2a464d7e0..000000000000 --- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils eutils - -DESCRIPTION="A set of cuda-enabled texture tools and compressors" -HOMEPAGE="http://developer.nvidia.com/object/texture_tools.html" -SRC_URI="https://${PN}.googlecode.com/files/${P}-1.tar.gz - https://dev.gentoo.org/~soap/distfiles/${P}-patchset-1-r1.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="cg cuda glew glut openexr" - -RDEPEND=" - media-libs/ilmbase:= - media-libs/libpng:0= - media-libs/tiff:0 - sys-libs/zlib - virtual/jpeg:0 - virtual/opengl - x11-libs/libX11 - cg? ( media-gfx/nvidia-cg-toolkit ) - cuda? ( dev-util/nvidia-cuda-toolkit ) - glew? ( media-libs/glew:0= ) - glut? ( media-libs/freeglut ) - openexr? ( media-libs/openexr:= ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${P}-cg.patch" # fix bug #414509 - "${FILESDIR}/${P}-gcc-4.7.patch" # fix bug #423965 - "${FILESDIR}/${P}-openexr.patch" # fix bug #462494 - "${FILESDIR}/${P}-clang.patch" # fix clang build - "${FILESDIR}/${P}-cpp14.patch" # fix bug #594938 - "${WORKDIR}/patches" -) - -S="${WORKDIR}/${PN}" - -pkg_setup() { - if use cuda; then - if [[ $(( $(gcc-major-version) * 10 + $(gcc-minor-version) )) -gt 44 ]] ; then - eerror "gcc 4.5 and up are not supported for useflag cuda!" - die "gcc 4.5 and up are not supported for useflag cuda!" - fi - fi -} - -src_prepare() { - edos2unix cmake/* - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DLIBDIR=$(get_libdir) - -DNVTT_SHARED=TRUE - -DCG=$(usex cg) - -DCUDA=$(usex cuda) - -DGLEW=$(usex glew) - -DGLUT=$(usex glut) - -DOPENEXR=$(usex openexr) - ) - cmake-utils_src_configure -} diff --git a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild index a334693dbd29..c71aa223a894 100644 --- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild +++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}-1.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="cg glew glut openexr" RDEPEND=" diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest index cf52ac0331d3..5efba9ef15ce 100644 --- a/media-gfx/photoqt/Manifest +++ b/media-gfx/photoqt/Manifest @@ -1,8 +1,6 @@ AUX photoqt-1.7.1-cmake.patch 358 BLAKE2B ecadfc9f5ff6cac0535f5db36efc87f37705e77bc6d4b2445a77430c606c642081bff5c6c5733804dcf6cc3878d424bce4c39fd590478ee596f63e23f022506b SHA512 3a5b74999bc6765c37252dd2b34e36ed910c0f3c58e30dbdc84b38b361b45bf6e9131525069b1184c7e2b4e820674742233359120c63c37324fb802e0d9c1726 AUX photoqt-1.7.1-exiv2-0.27.patch 3900 BLAKE2B 080ed5afb4c9a29779b6a875261a893315529dd87caacec31bca34b91a626bc196acb9ce3f7ed4427478855e31a4e24a14ef9d12834054c2c766e42596435fad SHA512 6a8b56ab47b4e2f21f951b8e78455b5ba7757c1a1d98ffd0f754a245662f87877a6a326409868091d0a163caa639ff7fc497151baee3b9fdae26b3cd291065f4 -DIST photoqt-1.5.1.tar.gz 1596831 BLAKE2B 306beaf97cb9e81a2a219e9549abba35eecfaa0f2ad79d769095014d73708f525d5efa3ff4d83f75e89e0f9971a3a46da8b98ca7259b3666e27fc9addc9e836a SHA512 ccb4ada12e76b611475ec66ceaa2ad3a15f92311d2b7c22aa8b94cd145a062bf502af6ff40fa9bb681c5dad97b2941c2a8203da4ac937c8d86c34d805084ec7c DIST photoqt-1.7.1.tar.gz 1324774 BLAKE2B b739508511cdc34b6de5736260692c48186a49d0cf62d8283238ee274d2fdf73716589277fa602f86c8c15fff87b49d1700202d260480e002dfa18380b47d328 SHA512 50cee1a77a5e69d05f19a8f1ac8ab18d1ef420962b05f3a76e12ce0f3202db7037c894bbd7631674504f0e51c2be690aff4248ed343d0da2dc8a1ccce2d8e078 -EBUILD photoqt-1.5.1-r1.ebuild 1133 BLAKE2B 3b5bf5a7baff887bc09653a2799c3372713252c9668f3d95650e2dfbdcba77dd82e637d9a9a3688039d305e8ec154e7d0a53351dbe8774f45f4f9feb204a6417 SHA512 991c545c015dc3fb89fc3311472e5fa46433015311ae7b8b26e704d910ca3fb8a405dc69241fe2074ed23339f7b185f070e31ccc0d238880e9b7cf43cd08960a -EBUILD photoqt-1.7.1-r1.ebuild 1473 BLAKE2B 2fc34b5c6dd9b41ddf954a86232c84246723a0e1b3c8aed4afd780602641cf20e61d8423457bfee4b60969f379e8c656d504dc4fd1396fd79f0305fecd8fe9df SHA512 793fa41b7f084c774284cdacf977830d02010bbf01b7b3323e1bafaa88e0e6812eba6dddae84d3dea41b5fdf16c1ddc75dda94ad4c73819be0abc571e8a7124f +EBUILD photoqt-1.7.1-r1.ebuild 1471 BLAKE2B 607dace056cb2c481275e48ec11d3ff381f48e2c23e9d1d03208950744f591db05dd0a2410c069739c869ac096d84a49a9c59e7d012eb3b7a85809615dd19c7c SHA512 5b45c2011f4fbc6c340c828a6073f61f73f81a5dc91124344f92bbfb232107d3afef95284fbeda0d6a56daf333ab8610bd81255f8292fa6b3659bb7ab7301b9a EBUILD photoqt-1.7.1.ebuild 1411 BLAKE2B 3e9d31303859cda721e5929022824df652be69b8f634807513f024d7ed9fc4e9a7523a26b3930f850971696cd837cc89c480e85512e168b8966489cd8aa8166f SHA512 0f8b88e6bcc2d1003d453153635f168bd923c3d3784547ef32af1a3a3f0203760e845e17d259468c4ceedd14485c36426ab59623ff540e40f8afbf533c8b3b9f MISC metadata.xml 474 BLAKE2B 44114be5222dc1c0ad5a926fc6ff85da5b284a929a0991795632896c0f56ad24021591260c899549eda9b36557dc251363d17eef52928930afaaafebdf29bcf3 SHA512 50c4bf4437dec5d9919e3a16fdc4e429e3fdbc8d23656ecca57ae7674bc90bd6e8e33949191d7c15d49cbfe5451e72155e1bf441f020a44ab98b35115a29b6e0 diff --git a/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild b/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild deleted file mode 100644 index 7702e5284c0f..000000000000 --- a/media-gfx/photoqt/photoqt-1.5.1-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils gnome2-utils xdg-utils - -DESCRIPTION="Simple but powerful Qt-based image viewer" -HOMEPAGE="https://photoqt.org/" -SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="exif graphicsmagick raw" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgraphicaleffects:5 - dev-qt/qtgui:5 - dev-qt/qtimageformats:5 - dev-qt/qtmultimedia:5[qml] - dev-qt/qtnetwork:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - exif? ( media-gfx/exiv2:= ) - graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= ) - raw? ( media-libs/libraw:= ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 -" - -src_configure() { - local mycmakeargs=( - -DEXIV2=$(usex exif) - -DGM=$(usex graphicsmagick) - -DRAW=$(usex raw) - ) - cmake-utils_src_configure -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild b/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild index 101227968331..b8f003fbdbfa 100644 --- a/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild +++ b/media-gfx/photoqt/photoqt-1.7.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="devil exif freeimage graphicsmagick pdf raw" RDEPEND=" diff --git a/media-gfx/pqiv/Manifest b/media-gfx/pqiv/Manifest index 0b4f6979e5c7..cb5e6d721b0a 100644 --- a/media-gfx/pqiv/Manifest +++ b/media-gfx/pqiv/Manifest @@ -1,6 +1,6 @@ DIST pqiv-2.10.4.tar.gz 138644 BLAKE2B 7dc358379d463e6b421c082942a2171b749ea41b4e655c64425d6cfdf8f251ce89d431b45a28d8b30eb5c022814bec7e365c3b3272ebf0cc7e994b803ddfd4ec SHA512 52534ed4728466b7c710db65115d7e79ad97546750946fa5c3a26b65055387b15c6239fdf1bb8c8345fe7ed2dfc7ed5586ffa2a864de44fd8213cff59f76048a DIST pqiv-2.11.tar.gz 139825 BLAKE2B 981d472ccd3284b2e9ad3da8e84233c95555a927af797f8421ac820225d3d39cab2275f01269a986bab54994e0fce2095b7c33b1201e7a6117e1c8399617341b SHA512 6017a9d7ed332915a9f6fa788bb02c3b9d4d83c2ae2f9a8ab7d7738caa14ba3e9d253906f2e73fdfd368bb5e7bc51380ee9906fd9921e5f7f113811fd3da66f7 EBUILD pqiv-2.10.4.ebuild 1796 BLAKE2B 3708b1f8969a498f3582db811e53a8c3a3fb58071abfdd9089a45ffccb7596c856afbab014094103df9ca0f788127dff22f103e7c23ca04ac9294275fe36c05f SHA512 e42bdb8f10bb1474e3c32c8164c2e208bfb3035108ccb21698b4736e96f98de7fcfb819e4a73085a2b3a34effd1348af06bdb2a60722226274bc3bc6777db8fa -EBUILD pqiv-2.11.ebuild 1798 BLAKE2B 7ef990a30f601a6e3651e643f8b013cdfbe82300e2e69e100573b968d9358ea177ce5fd5aebdcafd339f0ce8c6d61063b3f0c0da6e95d753a01e7d1a94774802 SHA512 980df3cbbcafc40946a7cfa17b86580637457d2549f69e63dc4443e0829b90e58b7adc14db6a025e4bf0866252600ecd782609584a0f7c62ba737db372924a96 +EBUILD pqiv-2.11.ebuild 1797 BLAKE2B 8c07b9249542088ff80733ad9ae1a6fa945e15da5f691829a2d9bb16936d9b536415f05acee4b45b81a925fbd60167c730def5c5c196d0be3f56cc3ba433fd07 SHA512 883b5c6235dbcf169664ff5290cb17b4158b63b713536980165cb4bd19b8d88d8b72851c6640b1ef3630cb2e3219c9d78ef0372be5bee15046b1462cf682e670 EBUILD pqiv-9999.ebuild 1798 BLAKE2B 7ef990a30f601a6e3651e643f8b013cdfbe82300e2e69e100573b968d9358ea177ce5fd5aebdcafd339f0ce8c6d61063b3f0c0da6e95d753a01e7d1a94774802 SHA512 980df3cbbcafc40946a7cfa17b86580637457d2549f69e63dc4443e0829b90e58b7adc14db6a025e4bf0866252600ecd782609584a0f7c62ba737db372924a96 MISC metadata.xml 584 BLAKE2B 5d617c553a0f5f4be6268f17dae36d3bb52e984c4c7c89df44b40e1bde1cff3e5619210548b93bf6ffc2e0ea32839d6b4fd39714b237aea23f1cad966c92b3ec SHA512 0d589cf085f6e6335aae5f6e32ccd153ddae1f0fa926fd3a135eabcdc20d5c560e2694216ba93b6d8c6c16bd8541f9d7aaa496e7ee4bc82fea90228a28320fbd diff --git a/media-gfx/pqiv/pqiv-2.11.ebuild b/media-gfx/pqiv/pqiv-2.11.ebuild index 499cd72f5f50..2f8ae62f1683 100644 --- a/media-gfx/pqiv/pqiv-2.11.ebuild +++ b/media-gfx/pqiv/pqiv-2.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 x86" fi DESCRIPTION="powerful GTK 3 based command-line image viewer with a minimal UI" diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest index 37b63ddf41b5..1968a85fa9c1 100644 --- a/media-gfx/qiv/Manifest +++ b/media-gfx/qiv/Manifest @@ -1,4 +1,4 @@ AUX qiv-2.3.2-optional-tiff.patch 519 BLAKE2B 1c2f4d4d79f3d746927f4c5af05769992460c30cdd438096d4c4d0c39a9460bcb921ddd854786ec394fc9e229ad239c541cc97f5468cd6934c15a0557275270a SHA512 c492b902bbd7771648deaffc7eafb8fccf86d294c0e2597999f2fff02ed1e02f6fc158ea95fe25c2a9b27d15dffe724c85654c99e7769254abb40e9fdcb8f358 DIST qiv-2.3.2.tar.gz 135164 BLAKE2B b6b82c3007cd3214bb0b812026d22ab0a3c7fce87e51c1f2e19634fe131656f7adc1e92d2e1fcdcc563f1fd8b7c298307e48823bb26e077b336a6983f31894ac SHA512 a6750ecf26bc5b78fbebfdfcfd7a8ab0a5d3ba4e4b19c4a5563e1631dfaf8cc98f7a0bc9449956bc06f8b98cb307b31f78178676ddc9df4fa03429fa31c174e8 -EBUILD qiv-2.3.2.ebuild 1390 BLAKE2B 552b9009ee8aea6a185f2de0675fcd9b3ade4297477cbc4e66c4b1c4ddb437243d053f20cdc9305675d0bc01bbc1241495824874db9b1ef494e8ecf4b45b3452 SHA512 a9e1c44d37f020f8eedac254fec803a7a4b7cdf05db5fb3f435c2b4208e1372b19a80220052b3259a90e9524cf22f58701f270d13ba97c37a244d1daed0981dc +EBUILD qiv-2.3.2.ebuild 1223 BLAKE2B 586921fac938875cfb54525bb00b134478287143d4f824d5521ca875dfc256fd8ca3252caf2e1b879153837aed78900ab75d0f92ce7da965d63030609281ae82 SHA512 7cb91c24aa67ffab9bf6884a9b4ebc9fec5122ded9638ab76e1e71d66affea869742a266dffbcebee6f8b5bb4cd083fef2c22793804ee3eb6c6a1e7c8f8acc84 MISC metadata.xml 419 BLAKE2B 91296f38a94e37a97e1925e348d13de307b5d72e78002e3e5e396658b8ab4f96c909c530947a154317f0e354063f36c8ea4093efed599ed6ffe3c9089827cdea SHA512 d9ae3b413f335a277b97e98ca245a3ffe1982cd777c08062ac43642f76cd8b567b815163738807ff5a826ef1c14ca24e20ae1041394db6b998f02fdd2dbad216 diff --git a/media-gfx/qiv/qiv-2.3.2.ebuild b/media-gfx/qiv/qiv-2.3.2.ebuild index 0b0984e667e7..cd62b56094ca 100644 --- a/media-gfx/qiv/qiv-2.3.2.ebuild +++ b/media-gfx/qiv/qiv-2.3.2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit desktop gnome2-utils toolchain-funcs xdg-utils vcs-snapshot + +inherit desktop toolchain-funcs vcs-snapshot xdg DESCRIPTION="Quick Image Viewer" HOMEPAGE="http://spiegl.de/qiv/ https://bitbucket.org/ciberandy/qiv" @@ -13,8 +14,9 @@ SLOT="0" KEYWORDS="~amd64 ~mips ~x86" IUSE="exif lcms magic" -RDEPEND=">=x11-libs/gtk+-2.12:2 +RDEPEND=" media-libs/imlib2[X] + >=x11-libs/gtk+-2.12:2 exif? ( media-libs/libexif ) lcms? ( media-libs/lcms:2 @@ -59,13 +61,3 @@ src_install() { domenu qiv.desktop doicon qiv.png } - -pkg_postinst() { - xdg_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index 9aed5bf5cab9..c525043e5709 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -11,5 +11,5 @@ AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5 EBUILD sane-backends-1.0.27-r1.ebuild 7729 BLAKE2B 99a75ac0aae614e4168b1216ed22c071acc4d1a448eeeee1a6c36991df23bf8e68dfb558d3047e144f8fd32cd4ad766a41238be5a991b4039172872011eed501 SHA512 42689dd5189e9bfba21f016dc63897b0fec6adb18fda2485c64c35764caceff307b18759aa359d7b56fb69aee86ceb769d1c5f5162d30cc9e8576dc3140f70aa -EBUILD sane-backends-1.0.27-r2.ebuild 8132 BLAKE2B f5ce6815024209c13bbcde6238408a00a9a09934c01f4e7bcf56b91b84d123a70b924fdf6158f026f0a23745fff1a427d9177c3628b26ecefa3b960175879118 SHA512 ffc7fd40e943a84a6fa44fe1d2ad9f4099b7b67a02a87f8851ac0ccb8507785ffad4134bf78c6392c2abb102da2a060a0be444ee61c7a589ca1807edefe41cf6 +EBUILD sane-backends-1.0.27-r3.ebuild 8160 BLAKE2B a88fe394c4c248c5cdac9072d740b707e0d240935b4098f0b50a0c477339ed86a11cac07559b02cb635b655d6919f0cc5e17a7717ac4fe810a320bb988e62fd6 SHA512 28db81c16ece23a86711fa12913ccaf2a2f6ca2e384b3581ac86c236d3e1735bf1468ab9b5c337bb1b2d4105118b62611494c0b07d698a607d2b7fc9cd4e3779 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild index e05d94fee84b..adbe847d22ea 100644 --- a/media-gfx/sane-backends/sane-backends-1.0.27-r2.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.0.27-r3.ebuild @@ -235,13 +235,13 @@ multilib_src_configure() { fi # relative path must be used for tests to work properly + # All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory + # --without-api-spec to not automagically depend on tons of stuff + # that break in many ways, bug #636202, #668232, #668350 + # People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html ECONF_SOURCE=${S} \ SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ BACKENDS="${BACKENDS}" \ - # All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory - # --without-api-spec to not automagically depend on tons of stuff - # that break in many ways, bug #636202, #668232, #668350 - # People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html econf \ --disable-locking \ --without-api-spec \ diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest index 997f770a039a..bd8bc1e3abca 100644 --- a/media-gfx/xv/Manifest +++ b/media-gfx/xv/Manifest @@ -8,6 +8,5 @@ AUX xv-3.10a-wformat-security.patch 519 BLAKE2B 7b0ba8ee6dc33af787040e72fdfd4cf1 DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa861d9b2b6898d6e378b4a61a57c746a8822793a8e11e54165faf859e073ef99c9fbea5aa0c4c8caa4608ef03f553003b779a4bf59c3ab6 SHA512 e2ac5a3b4d743bf142c162b00815dd9d8dcaf345d0649016b2c6441fe2329879471b19453808e677c1a0b8eeb3468295dba160b1f30eacb2a7a9d8524ce03e75 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f -EBUILD xv-3.10a-r17.ebuild 2598 BLAKE2B 035bf28413f30b3a615f59d3266c59b4e9833f8d26ec84b2351e0a9ec3a1da90dcf12f2ae3e8afae1d79369bb5258fb6532ef76dca72c0c0539f4e981f4aef61 SHA512 6f56e5bc72b1912a8901355ed6847bbaea44bc4c11f05e5537e1921bb1b177537604116683e2f80d523675d778ca182fb474eb2070ee3c9d002ea621b467dd24 -EBUILD xv-3.10a-r19.ebuild 2445 BLAKE2B 1a0f47df51caa4ae24cd2ea802783a4d7801b9354fca6bb956fae26a32fd655b7f10272f226b759771e9250e72f022873e3b0d9fac9ba32464084c30c16166df SHA512 4b95123a458431e73b62dcd8c38cfeb8151e4922a3736e7d808905f5a089dee9dbf3a3d5c6e70657ca53007c9dfc0645891ce90144f8c56ca04187fff976e2d3 +EBUILD xv-3.10a-r19.ebuild 2444 BLAKE2B 5049bef53eb5c3d080e102e97295b75cdba90c3fe770790f1b6018e9bf34088ed5fa79e0c21e52cffd9c0c54c47f7dbc91846aadcd5198869e10b9ae45c492fe SHA512 bd8e3dd3104f235ed516fb4e3b98cc778acdc787fe37841328d2f384262d39f6efbf10b278c4939c205fc420bafbd2d996d3402bf069b8950bb633471ccdb723 MISC metadata.xml 249 BLAKE2B a10cceeac3a30f80ec870c8976e45bd2e0326e472b03cdfbe85b639f95dc7cdc8f372e5efafa5c9c8e679e77a24d5507f3a8f0dc97f2207252e280b3bb936662 SHA512 2250a3bff9eebe0962c70d89aed4f7e95dd3d33b5c3171f02bcf99d972d5242ec04b25d73b3ffd99ce96a641cf8eb78befb41941a352f4ff754702712b4e937d diff --git a/media-gfx/xv/xv-3.10a-r17.ebuild b/media-gfx/xv/xv-3.10a-r17.ebuild deleted file mode 100644 index 84423f73c816..000000000000 --- a/media-gfx/xv/xv-3.10a-r17.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils flag-o-matic - -JUMBOV=20070520 -DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats" -HOMEPAGE="http://www.trilon.com/xv/index.html http://www.sonic.net/~roelofs/greg_xv.html" -SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz - ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz - mirror://gentoo/${P}.png.bz2" - -LICENSE="xv" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="jpeg tiff png" - -DEPEND="x11-libs/libXt - jpeg? ( virtual/jpeg:0 ) - tiff? ( media-libs/tiff:0 ) - png? ( >=media-libs/libpng-1.2:0= sys-libs/zlib )" -RDEPEND="${DEPEND}" - -src_prepare() { - # Apply the jumbo patch - epatch "${WORKDIR}"/${P}-jumbo-fix-enh-patch-${JUMBOV}.txt - - # OSX and BSD xv.h define patches - epatch "${FILESDIR}"/${P}-osx-bsd-${JUMBOV}.patch - - # OSX malloc patch - epatch "${FILESDIR}"/${P}-vdcomp-osx-${JUMBOV}.patch - - # Disable JP2K (i.e. use system JPEG libs) - epatch "${FILESDIR}"/${P}-disable-jp2k-${JUMBOV}.patch - - # Fix -wait option (do not rely on obsolete CLK_TCK) - epatch "${FILESDIR}"/${P}-fix-wait-${JUMBOV}.patch - - # Use LDFLAGS on link lines - epatch "${FILESDIR}"/${P}-add-ldflags-${JUMBOV}.patch - - epatch "${FILESDIR}"/${P}-libpng15-r1.patch - - # Link with various image libraries depending on use flags - IMAGE_LIBS="" - use jpeg && IMAGE_LIBS="${IMAGE_LIBS} -ljpeg" - use png && IMAGE_LIBS="${IMAGE_LIBS} -lz -lpng" - use tiff && IMAGE_LIBS="${IMAGE_LIBS} -ltiff" - - sed -i \ - -e 's/\(^JPEG.*\)/#\1/g' \ - -e 's/\(^PNG.*\)/#\1/g' \ - -e 's/\(^TIFF.*\)/#\1/g' \ - -e "s/\(^LIBS = .*\)/\1${IMAGE_LIBS}/g" Makefile - - # /usr/bin/gzip => /bin/gzip - sed -i -e 's#/usr\(/bin/gzip\)#'"${EPREFIX}"'\1#g' config.h - - # Fix installation of ps docs - sed -i -e 's#$(DESTDIR)$(LIBDIR)#$(LIBDIR)#g' Makefile -} - -src_compile() { - append-flags -DUSE_GETCWD -DLINUX -DUSLEEP - use jpeg && append-flags -DDOJPEG - use png && append-flags -DDOPNG - use tiff && append-flags -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX - - emake \ - CC="$(tc-getCC)" CCOPTS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ - PREFIX="${EPREFIX}"/usr \ - DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ - LIBDIR="${T}" -} - -src_install() { - dodir /usr/bin - dodir /usr/share/man/man1 - - emake \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}"/usr \ - DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ - LIBDIR="${T}" install - - dodoc CHANGELOG BUGS IDEAS - newicon "${WORKDIR}"/${P}.png ${PN}.png - make_desktop_entry xv "" "" "Graphics;Viewer" -} diff --git a/media-gfx/xv/xv-3.10a-r19.ebuild b/media-gfx/xv/xv-3.10a-r19.ebuild index 1b06f5a96590..f824a67e122e 100644 --- a/media-gfx/xv/xv-3.10a-r19.ebuild +++ b/media-gfx/xv/xv-3.10a-r19.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz LICENSE="xv" SLOT="0" -KEYWORDS="alpha ~amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" IUSE="jpeg tiff png" DEPEND="x11-libs/libXt diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index ad74f040f13b..0b5867510540 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -1,6 +1,5 @@ AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1 AUX zbar-0.10_p20121015-ImageMagick-7.patch 1135 BLAKE2B 103cfe85d547cd3087a08676abdfd5966b9b4dd32de4c35e1aee144247af8562e6425d65d170fcb98bcb43e0bc18dcd39d4cf3baf46eea4a1c81814a14946bb0 SHA512 c67dee821338d0bbb54b3c4b22a75616e876ad56e5bbcaad856fe16b39ef3e07b7b80dcb6c25023857ebd561c55ac4faab144fa4ead05424df24d5af7c2509dc DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42 -EBUILD zbar-0.20.1-r1.ebuild 3725 BLAKE2B afedede5b3120e473e3d72d15f386a4931d318c096d338f070b65d7dbf9f722d6d292b5759b5a7d9f13e040ff7f54ff444e9c1d3603f0aa23333b770ab18fdd1 SHA512 182b93701cc615df4db4aa83e8ff8fe38ecafb2aa376ae69d3ee89f9fd86e0036e6f2bc8ce20c2ef9c52808bf815831b4e7ae3a7b8608c093fe92ce61dd4b4e4 -EBUILD zbar-0.20.1.ebuild 3691 BLAKE2B 189ed71aaefad1f83cf257ff7963198abb196fc0ada528f303f2d10ebe6564351c256328716dbf0f58a84cd02c2ec5acf64a505dff9611adb91f3ef68d1603d1 SHA512 6e9bc1e749fefc3d0502b5115f6f0f64ba70035916df793c0110d259d1a91f122dd34c11c2b387a192b7a0df2d7d59fd39955b8a900af9b423b93ed5cf78b4e4 +EBUILD zbar-0.20.1-r1.ebuild 3723 BLAKE2B 4cda360aa4207d10b9f23c6a3f4389f6a5e89ee6ed067ec59f1cf31875ab88b28ffd624e076774aaf425ebbc787de327f345e88b677a20c348cc4cef63be2760 SHA512 3fa329f034162bfac7eb0ef827ac23349eabff32698b147062a5828fad7ac0513ac840300e32757e9be72d373db617235a234c8d360588db2e3e4f8e126fa183 MISC metadata.xml 353 BLAKE2B 7b2ecbdb282d7be372b33efc762ff91d574edf1f176e65c300a2a1cdab0d9c86a12be1d4c49f48a684237eb265ee7491ef9bebbfd62a6005246031f7271b7e32 SHA512 8547b611ca96a01ec0d6dcd01c61203984af10306223a77071fe9be348d1ca7ceb290c4160ca9eb8ebc04227caa9b9f5bf3d3d436b97f140fc534fbd3236826c diff --git a/media-gfx/zbar/zbar-0.20.1-r1.ebuild b/media-gfx/zbar/zbar-0.20.1-r1.ebuild index a374101200a2..1a03d35fa4d5 100644 --- a/media-gfx/zbar/zbar-0.20.1-r1.ebuild +++ b/media-gfx/zbar/zbar-0.20.1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv" REQUIRED_USE=" diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild b/media-gfx/zbar/zbar-0.20.1.ebuild deleted file mode 100644 index 700328f75383..000000000000 --- a/media-gfx/zbar/zbar-0.20.1.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx - -DESCRIPTION="Library and tools for reading barcodes from images or video" -HOMEPAGE="https://github.com/mchehab/zbar" -SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv" -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( X ${PYTHON_REQUIRED_USE} ) -" - -COMMON_DEPEND=" - gtk? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:2[${MULTILIB_USEDEP}] - ) - imagemagick? ( - !graphicsmagick? ( media-gfx/imagemagick:= ) - graphicsmagick? ( media-gfx/graphicsmagick:= ) - ) - jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) - X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] ) - ) -" -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.8 ) -" -DEPEND="${COMMON_DEPEND} - sys-devel/gettext - virtual/pkgconfig - gtk? ( dev-util/glib-utils ) - java? ( - >=virtual/jdk-1.8 - test? ( - dev-java/junit:4 - dev-java/hamcrest-core:1.3 - ) - ) - test? ( ${PYTHON_DEPS} ) -" - -PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch ) - -pkg_setup() { - if use python || use test; then - python-single-r1_pkg_setup - fi - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default - - if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then - eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch" - 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 || die - eautoreconf -} - -multilib_src_configure() { - append-cppflags -DNDEBUG - - local myeconfargs=( - $(use_with gtk) - $(multilib_native_use_with graphicsmagick graphicsmagick) - $(multilib_native_use_with imagemagick) - $(multilib_native_use_with java) - $(use_with jpeg) - $(multilib_native_use_with python python2) - $(use_enable static-libs static) - $(use_enable threads pthread) - $(use_enable v4l video) - $(use_with X x) - $(use_with X xshm) - $(use_with xv xv) - ) - - if multilib_is_native_abi; then - if use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)" - if use test ; then # bug 629078 - java-pkg_append_ CLASSPATH . - java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar) - java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar) - fi - fi - if use qt5; then - myeconfargs+=( - $(use_with qt5 qt) - $(use_with qt5) - ) - else - myeconfargs+=( --without-qt ) - fi - else - myeconfargs+=( --without-qt ) - fi - - ECONF_SOURCE=${S} \ - econf "${myeconfargs[@]}" - - # work around out-of-source build issues for multilib systems - # https://bugs.gentoo.org/672184 - mkdir gtk pygtk qt test zbarcam || die -} - -src_test() { - virtx multilib-minimal_src_test -} - -src_install() { - if use qt5; then - local MULTILIB_WRAPPED_HEADERS=( - /usr/include/zbar/QZBar.h - /usr/include/zbar/QZBarImage.h - ) - fi - multilib-minimal_src_install -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die -} - -pkg_preinst() { - java-pkg-opt-2_pkg_preinst -} |