diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-07 11:42:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-07 11:42:03 +0100 |
commit | f70601e0934acd62f6c5d06c5ede4cc607179514 (patch) | |
tree | 0b337390375de04b950fc4b45edc0f895a4701a4 /media-gfx | |
parent | b2be182d49eea46686b5cf2680d457df61e89dc4 (diff) |
gentoo resync : 07.07.2018
Diffstat (limited to 'media-gfx')
25 files changed, 329 insertions, 302 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex d7965ad74cec..bb6ef39c1b3a 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest index ae777cd467e4..5ce81c50f3f7 100644 --- a/media-gfx/dcraw/Manifest +++ b/media-gfx/dcraw/Manifest @@ -1,7 +1,9 @@ AUX conversion-examples.txt 545 BLAKE2B 4bda8339c0ae2f427ae0432b09da54aa5c194318b5cc0d3131c2e96f2b26ed0f91f6f419f0830fc773ab9be543019143755e039866146c6ce0eb361f9172ae4c SHA512 47213effb868ac4754075e43a6194ccbbe3e1431ef47280a670ad7e843cf727ad63ebf76849210672a72a79b1f702ca112aeece12284191f11c859a54fc090a9 AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7b7767d45b88d7c139bb038816448c50a682c6645095f79be9d2836c6f896e27a8ffc20c SHA512 ba872972125a5394e8d29bf6e5b612959b228265885218061eeff6a17f87dd1891e33876c49fd4071a76517843b6709d16f1fa976994c49c9357d7dc7211af9e DIST dcraw-9.27.0.tar.gz 191803 BLAKE2B 85f2954ebe7d9ba5c30f1ad971c53f87b4b10094084837a361f1975bb78ca07edb8a535ef524374b8644434d43fc515523c08c2336dd460d543756a1819caf5f SHA512 2b2faed3f1889ef82a50721f7d3f22b081104b586d644d369fa849ad08604c10898e9dfccf8935828cf432db74352161fe6d1f9bde5fbfa4dd8435188767a17a +DIST dcraw-9.28.0.tar.gz 194193 BLAKE2B d39a2d76dbbe74a2aed21c6b132ac25c9dd17312813e7f640a4a6d4abd4e8f1868ad596296ca9bfe61427b8b4764821e32679128747ff5a9452988814b77c638 SHA512 04609c4ddd5d1c9fa0ee1617d2ef25efdc22451e1fa6cf669d93abb1fa630a18198b30a289400f1814c8dca285547da8b081a1b00b085c00bb9318ad25c48a30 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56 EBUILD dcraw-9.27.0.ebuild 2961 BLAKE2B 7b8e95853e118b6262bb7996745c6ce375c6e7f56b6d5b957073966c3558b85a2ccf276dcff83b45df8232791b95ba41a2e3b946d25e0931215cf89d97532ace SHA512 30abf4256100ead2e7ca525cf365fb18e5d46afa6fe3bc0012f272ed3bc715349602d05a8b26d44c401138517848fa2a1796094efaff9df8244fd715d9a5f5c2 +EBUILD dcraw-9.28.0.ebuild 2975 BLAKE2B 7aa79016cb14ee338227b4c5adecfbc6369719e189687bb7f6755883f44eaee76a27e4e289745e4283b6c8b626608a846e5ba4ed7c43544e88ef433e09067ba2 SHA512 356259bff26fcc2fd182cdeec679af7ba7d9d755d681e84adb1517326a8c1405fa01ae640095cfb5fa0208f14c75261240c260ab906aeb63b34d2d0607ef35d3 MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755 diff --git a/media-gfx/dcraw/dcraw-9.28.0.ebuild b/media-gfx/dcraw/dcraw-9.28.0.ebuild new file mode 100644 index 000000000000..1c2627ff38a7 --- /dev/null +++ b/media-gfx/dcraw/dcraw-9.28.0.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit readme.gentoo-r1 toolchain-funcs + +DESCRIPTION="Command-line decoder for raw digital photos" +HOMEPAGE="https://www.cybercom.net/~dcoffin/dcraw/" +SRC_URI="https://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz + mirror://gentoo/parse-1.73.tar.bz2 + gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW" +IUSE="nls gimp jpeg jpeg2k lcms" + +COMMON_DEPEND=" + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + jpeg2k? ( media-libs/jasper:= ) + gimp? ( media-gfx/gimp ) +" +DEPEND="${COMMON_DEPEND} + nls? ( sys-devel/gettext ) + gimp? ( virtual/pkgconfig ) +" +RDEPEND="${COMMON_DEPEND} + media-libs/netpbm +" + +S=${WORKDIR}/dcraw + +DOC_CONTENTS=" + See conversion-examples.txt.gz on how to convert + the PPM files produced by dcraw to other image formats.\n + + \nThe functionality of the external program 'fujiturn' was + incorporated into dcraw and is automatically used now.\n + + \nThere's an example wrapper script included called 'dcwrap'. + This package also includes 'dcparse', which extracts + thumbnail images (preferably JPEGs) from any raw digital + camera formats that have them, and shows table contents. +" + +run_build() { + einfo "${@}" + ${@} || die +} + +src_prepare() { + default + rename dcraw_ dcraw. dcraw_*.1 || die "Failed to rename" +} + +src_compile() { + local ECFLAGS="-O2" # Without optimisation build fails + local ELIBS="-lm" + + use lcms && ELIBS="-llcms2 ${ELIBS}" || ECFLAGS+=" -DNO_LCMS=yes" + use jpeg && ELIBS="-ljpeg ${ELIBS}" || ECFLAGS+=" -DNO_JPEG=yes" + use jpeg2k && ELIBS="-ljasper ${ELIBS}" || ECFLAGS+=" -DNO_JASPER=yes" + use nls && ECFLAGS+=" -DLOCALEDIR=\"/usr/share/locale/\"" + + run_build $(tc-getCC) ${ECFLAGS} ${CFLAGS} ${LDFLAGS} -o dcraw dcraw.c ${ELIBS} + + run_build $(tc-getCC) -O2 ${CFLAGS} ${LDFLAGS} -o dcparse parse.c + + # rawphoto gimp plugin + if use gimp; then + run_build $(tc-getCC) ${CFLAGS} ${LDFLAGS} \ + $(pkg-config --cflags gimpui-2.0) rawphoto.c -o rawphoto \ + $(pkg-config --libs gimpui-2.0) + fi + + if use nls; then + for lang in ${LANGS}; do + has ${lang} ${LINGUAS-${lang}} \ + && run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po + done + fi +} + +src_install() { + dobin dcraw dcparse + dodoc "${FILESDIR}"/{conversion-examples.txt,dcwrap} + + # rawphoto gimp plugin + if use gimp; then + insinto "$(pkg-config --variable=gimplibdir gimp-2.0)/plug-ins" + insopts -m0755 + doins rawphoto + fi + + doman dcraw.1 + + if use nls; then + for lang in ${LANGS}; do + if has ${lang} ${LINGUAS-${lang}}; then + [[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1 + insinto /usr/share/locale/${lang}/LC_MESSAGES + newins dcraw_${lang}.mo dcraw.mo || die "failed to install dcraw_${lang}.mo" + fi + done + fi + + readme.gentoo_create_doc +} diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest index 6cd61d5365b6..930df92d9790 100644 --- a/media-gfx/feh/Manifest +++ b/media-gfx/feh/Manifest @@ -1,14 +1,8 @@ AUX feh-2.6.2-debug-cflags.patch 197 BLAKE2B a5a9b2c2ac22869401303706b92a10474d091cb01869c6272adac79000eb02591e424fd71734d3c0bd29d253854a27f4fe1fe21f99ba55cd48c66325521dc836 SHA512 eb09a90a9ff3ba2ae7a40c8ef9e5b361d42bb045e194ddb5823111d780da265371ee087c6f80963d80f5cd1d0427478f46fec9b0f0607ad2bb122415a9c2e397 DIST feh-2.18.3.tar.bz2 2127924 BLAKE2B c667a7bea38e66afd4ed7c688c3232770041964893ead60dd35eb06a7db7abed8c2275e1126f7e2081a4df3abf8d551f4610a3dea4887dd7c4f0c9637e15b13a SHA512 3ffb44f8a2207c2c8725a519a23b7235a6df86aa8578b7b79a8819122e509d18dcc8263859e02cdbdeb5fb5ca56229f90aef567d53d63d763f8259fbc1fff515 -DIST feh-2.24.tar.bz2 2130683 BLAKE2B b1f720d9ef74b4418daf92b945e57ca7d34839f72f5be47312dd936274e411a0ec4d4df2042cbb98a0656fd52a9cce804d627e8db497467ef4461eb994e5ccd3 SHA512 5d745586201dfc9b72a2e3987aed5d9c36f18c3123d3083c1c130f6b301da98dccbc79bc6aa55c70a895e831a7325c4cbf75fa2ca82a3a05eda3e98e1de8cb7d -DIST feh-2.25.1.tar.bz2 2131624 BLAKE2B 3e7d9145bb416d433f3ec92b5c921a734de137e3637999b6c3c6ac7e8d8b2e05a8a34dcdb12715431d4dd22f37a6e70b93bd18831c5e05ae9ce91b8e2e2f17d4 SHA512 a821d46901d4cf59bb09b911f28c6ab26fbd0ee9784b50fbacfb6cf23483da5d29ebbb4cc53b23289181bb3ba0dc9893a3f39a90b3420d0bd98d740d5583fc3e -DIST feh-2.25.tar.bz2 2131457 BLAKE2B 50a3ab469dc637195e4421871ee01f690dd890abf97d408e2781684e497623d455ce3a92f5f809b3ab1562396d605618061786cfbaf78541064cc6c2c0892d1a SHA512 42bac46f71d3833affd076d985464c32dbba5ad34c0ab02692e6d9dba68304b2209c87221340f695408c1959a4482cdaf18fda6552a14cc42e08655bbb28ae4a -DIST feh-2.26.3.tar.bz2 2132140 BLAKE2B 4d1e87ecdc0aac06c06fe0f0901aaaf26cd288bbf7283e9106b3034c806230680feb18742dabd6648efe9dfe81e703fe6b17580f1a1ea95a6d21d50a47aac438 SHA512 b7212e99d4210b71c1d84e6712b7cac18a65367ebf9a17d889412dddb66aefd2c3f0bf0b624b09f3b46aa007cd27ac1bd2e4a7c4757e8bc90d49d2a435baaf06 DIST feh-2.26.4.tar.bz2 2132124 BLAKE2B 962af7b7e806a8cea570c1512c377b0eb9ca9924706bdce63cebe7dad240d9b5a7f16c0291aedf954abb45bbecc4f835f77bccbd42101a7f99dea92a102fc0bb SHA512 cd78081a6ab821a0c6b20fa6746ec180df97ab3412e0cc56bbccaf700c443b4fd5f95edd9b2781ebb2eb85491946809c962039346830ae6f5f85ea0ae5e7de81 +DIST feh-2.27.tar.bz2 2131975 BLAKE2B 84100beaff26454c8d33a479171b1b59402b74d04860192e5e826dcac93a288b095afee6f0676b56eae0d1f8dd3c4998767d0cd196ffd3b6a5406f5c1e6eb1d9 SHA512 6d9cf38e9b40291f6e7145705057a2c945b720b22d85020e265c2a158d5e4ca68cca958e2fae3d01a91bb4b2c52ebb5d2c298c41bf8ff3e4f635af7c006d0cc7 EBUILD feh-2.18.3.ebuild 1194 BLAKE2B a9ba56ee28f45ba475db7373f3caf7534fb9cb1e020b85b6f4fa19fecd00cd23c493d862b662639e73cd2e9b38bc8703e42a36107e26cee636b0ad871b1d6990 SHA512 f23c472d2686a21fb3c81111415682d059a121eb5e0a14a6a71298395407e3aea0f5a16b9d91ca8c46c2e7a1ce455656832863ba63de2a142e056dac132e7346 -EBUILD feh-2.24.ebuild 1198 BLAKE2B 4e4dc1080aaf4b7df37314c30f175ddbdb52b3335b575a9bec86b63855e33cb34e574fa8085aed2484b0aaa990414edfef533380e96b4dbf05b3460dcb76615a SHA512 98e07ca40951af821217239f3124b6c189dc82ba551cf841d759f9ae4aec72a50c3f447b88c522b61ac24255d8c76dbe930fc2b9009ba54bee02b1fd5e65e43a -EBUILD feh-2.25.1.ebuild 1198 BLAKE2B 4e4dc1080aaf4b7df37314c30f175ddbdb52b3335b575a9bec86b63855e33cb34e574fa8085aed2484b0aaa990414edfef533380e96b4dbf05b3460dcb76615a SHA512 98e07ca40951af821217239f3124b6c189dc82ba551cf841d759f9ae4aec72a50c3f447b88c522b61ac24255d8c76dbe930fc2b9009ba54bee02b1fd5e65e43a -EBUILD feh-2.25.ebuild 1198 BLAKE2B 4e4dc1080aaf4b7df37314c30f175ddbdb52b3335b575a9bec86b63855e33cb34e574fa8085aed2484b0aaa990414edfef533380e96b4dbf05b3460dcb76615a SHA512 98e07ca40951af821217239f3124b6c189dc82ba551cf841d759f9ae4aec72a50c3f447b88c522b61ac24255d8c76dbe930fc2b9009ba54bee02b1fd5e65e43a -EBUILD feh-2.26.3.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69 EBUILD feh-2.26.4.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69 +EBUILD feh-2.27.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69 MISC metadata.xml 465 BLAKE2B 8f1b9aeb152fc8941e9cf72cf562b46d4b7b93677713b99cc7ba01cffba527cfc818e5b0dfb8d5d3878dd31f2488277036f876c01d2d85a5422b285275819eb3 SHA512 7156b24a140c6b586af743cc670b588eaba3c255fd356f689c26c737195ebcb9d36bcf7cc6291c668d8ae6a4da3d4914a0830d80d86e3831e966bc38708607c8 diff --git a/media-gfx/feh/feh-2.24.ebuild b/media-gfx/feh/feh-2.24.ebuild deleted file mode 100644 index ee6ce5b79e0e..000000000000 --- a/media-gfx/feh/feh-2.24.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -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 -} diff --git a/media-gfx/feh/feh-2.25.1.ebuild b/media-gfx/feh/feh-2.25.1.ebuild deleted file mode 100644 index ee6ce5b79e0e..000000000000 --- a/media-gfx/feh/feh-2.25.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -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 -} diff --git a/media-gfx/feh/feh-2.25.ebuild b/media-gfx/feh/feh-2.25.ebuild deleted file mode 100644 index ee6ce5b79e0e..000000000000 --- a/media-gfx/feh/feh-2.25.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -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 -} diff --git a/media-gfx/feh/feh-2.26.3.ebuild b/media-gfx/feh/feh-2.27.ebuild index 0fc4bf732db8..0fc4bf732db8 100644 --- a/media-gfx/feh/feh-2.26.3.ebuild +++ b/media-gfx/feh/feh-2.27.ebuild diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest index 1014c8435686..194f32629b79 100644 --- a/media-gfx/fontforge/Manifest +++ b/media-gfx/fontforge/Manifest @@ -4,5 +4,5 @@ AUX 20170731-startnoui-FindOrMakeEncoding.patch 751 BLAKE2B c4a0248affa9117c5150 AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6456bd8ed47b12ca8681e8970e65e3b69cd06880794832f761c6de801d9e7c51e1edfff5abf434aa7f7dcc7c2 SHA512 026f6765b2db7549f72cd6ccff8d23bdf357ab24035c89cd792fa933f6033445f6cbaf7fa20f1372bdeda2caa242b9f8237f3019292cba0cc551c6de9e5c8341 DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11 EBUILD fontforge-20170731-r3.ebuild 2790 BLAKE2B 8d0290229ff389cca1f1e4915801b1f9ee0683a55030eadec60da8c82d4177f47af0592b366c9f1c7b730568e01a98d202e9502647f91cfccb02c5ac0b7bc98b SHA512 f14898b95f7a457b793d5ebabc84ce845296c84fe7360ab6069db4c99b485b5231ff12285981ba0e6fabe815204fe0b5cf878f0c84d594622e367afb62497b89 -EBUILD fontforge-20170731-r4.ebuild 2853 BLAKE2B 7c6f8663fd526e895039ce5892577c74709a7f009c9f623f400a77da2dbe401afe712ed096f937e69481b78f4633a30d04a45d64d0dc2c106a8246eca257dd44 SHA512 809f1c96f30e757bc0c19f94e08a48f29f208af85e4b9904e5dd91354cef6cb9ffdcdde17d5c87db5054844455df3042ff547289cc70c9b81ee192c85e7cb403 +EBUILD fontforge-20170731-r4.ebuild 2852 BLAKE2B 6ca3b179543a8e95853c3b77ba7664bc28f4f00c7ae0af7ace7590cadd8f105fc1499598956191d8ed90599767ce8438928b22b254d093b24b439f29792fa315 SHA512 8ffa980ad263e24da8424b0af679d6f4718f96e24180648aeffe1692f1f8734cb3fcdcb17338791a46d4ad6325146cf7009ae1a18eed1781935ee2ea0e4e4cca MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28 diff --git a/media-gfx/fontforge/fontforge-20170731-r4.ebuild b/media-gfx/fontforge/fontforge-20170731-r4.ebuild index af30c3058c70..f0072048fd04 100644 --- a/media-gfx/fontforge/fontforge-20170731-r4.ebuild +++ b/media-gfx/fontforge/fontforge-20170731-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg LICENSE="BSD GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X" RESTRICT="!test? ( test )" diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 28159a787fa6..dc7d6307538d 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,21 +1,21 @@ DIST ImageMagick-6.9.10-1.tar.xz 8918684 BLAKE2B 62e77bed14b2a82f2fd2e429142c4200d7b243caa3ed8ff11be672d1c0a9094b7916dcbac11f0876cf46e6aa4753044e0cbe0c25dacafe5966f49d3f586bb747 SHA512 570edd18299982769a471ae37b7458401b13aa7802fd9f6ae8a72a2ece34cbf9b30e42a9f06abe62a6b01cc3573fc16d4c43a732260e0dedc8da54fef82f74a4 +DIST ImageMagick-6.9.10-3.tar.xz 8922536 BLAKE2B 36936b28aac025bd948d9925707877b6f6b5a9eb50f1afc2f318a0596c9096b7853f4db44c42994fe32b7ba0fe42eafb9d705ead0faf6f75eb9e7e07bc1c97e4 SHA512 760e8b003415fcf6c83e542346800f1f2d8834cd47ba343eead1f0fa228f2f44af7ca9b4379de52498a3da76aa35f25d0ec939cefa71718400702bc6801fffbe 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-6.9.9-47.tar.xz 8918196 BLAKE2B f28948d5728cbd2b011091ded2c12b507d1939ae5f2e0872c098ea488a3668d5f15782de023a6775a60790feeabcbab3ae62917f5f160bbc5ec59b65527775d5 SHA512 7bf7ae7fc276c2857f546370851ef7aaf1704c1b5bbad1a739d964e8e48a4ece9d9274e154a5aaa18c24f31e60e03d2df661cca922a3fff780cbcddd86524cb5 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 -DIST ImageMagick-7.0.7-31.tar.xz 8613064 BLAKE2B 6d4f731002cf099b5fc007e645fbfec32fb87b5f9b77f1c8a15897fed44c5fe55f8d356775675c709cf3ea600a2cbf67b8b9c7d7a0cec5c55647714d5d0ade27 SHA512 6575c009b021eb759e2129908e8deafcfa766758aae0b8f51d8b0c555444440c404bf20df63671259315b7e33476322217e3239aa2ba1c8b938996d54e988ee5 DIST ImageMagick-7.0.7-35.tar.xz 8614296 BLAKE2B 7c3c65d3fa630040febd40370fe93d3ba946b3d71cfef4daa340154a111f58af8e5028813fd35d1db99796d691f4d13999c3030b8ab7dc82494d0d89e2853359 SHA512 65aac1f1b4546212608acc1bf8b7b0a6fc7e45c9273183725dcfaf04e16948112fd4cfb295d88e5860dff66f04c54cc504af067e32c46cf8662f4ff72c64688a DIST ImageMagick-7.0.8-1.tar.xz 8606196 BLAKE2B fd7bd794793cd9bb063023f2f7f36272efb99a1b75082dd3f71a244b7cb0e28971ff091af5b8a575084f42bd5a4639641b44831dae0cc52ea03d6624a650f01e SHA512 e7f2acb9a7912bb68dced74b7a0381d4909b13aa4fa36e4f3c56479b7b24f8f91ff21c171e542bec63e2873a94adea4673c5351ce1d641f72e8279886eb4b224 +DIST ImageMagick-7.0.8-3.tar.xz 8613672 BLAKE2B c3ad7bb2d0917d2551b7c8ae0d80a8ab95e31d40cf18c26d7df363c3df209d7923a62a7fb90aec581fc4101139bc369a82289a96f51965f533b1956a9cfa4eed SHA512 0594de337c9eb1d116b15eeac0f1bceefeb86f13a41bc6721b120fa2e58f0ca5e2e1454b4e2b670c93545f13406f8bdbf54e5b3470e34841b5e9ac9d26821b70 EBUILD imagemagick-6.9.10.1.ebuild 5129 BLAKE2B b7b332d8137559fc443657fe4510668dce05852e1012d055cf8612668182ead6b20850a0182340ca9f6ebdb96356ab63c99c788ff4eb3ffc961a166d80059c3e SHA512 aa9cc3f5bed77db0a14ad9fc2400393287ff6656d31fc9dce58b969c04a38c6efbd4b6c48a9cef0e19407315226766725147341bd9bf86db184d729586c9bb20 +EBUILD imagemagick-6.9.10.3.ebuild 5134 BLAKE2B 59fe466ea5b6c330b626274a4b22de05b7ed18d62f28986be097f6c50b68617dd83c2207bf220455f18545919ade85286a45192befd7977b573f6ec663c8ebcf SHA512 b84b26c37a083db69e5d28ee4a13d143fac2b4d4e0b2f67b1a3a9a243f59b83820d48ebad01d385e0ced40223648cd78c1618473061b7159790d5b76768cc237 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-6.9.9.47.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 EBUILD imagemagick-7.0.7.35.ebuild 5135 BLAKE2B 4ae4afe162f2ee49efff7e8411db1c3b6091ce92d5f87bf361e2efe4b4414b8357a480b5f29d4c65f7291f673e7e5324dd42dd84dd4f387e40230394cf60cc70 SHA512 73588fd964051bc8ba3e1465b25e63a90882d8b452a04a9cd40070953a6c3c59ccfc8fd64b4a7f537d6d1811b7f8160db534abcb46bd6e0be4260e0ff1138b77 EBUILD imagemagick-7.0.8.1.ebuild 5135 BLAKE2B 4ae4afe162f2ee49efff7e8411db1c3b6091ce92d5f87bf361e2efe4b4414b8357a480b5f29d4c65f7291f673e7e5324dd42dd84dd4f387e40230394cf60cc70 SHA512 73588fd964051bc8ba3e1465b25e63a90882d8b452a04a9cd40070953a6c3c59ccfc8fd64b4a7f537d6d1811b7f8160db534abcb46bd6e0be4260e0ff1138b77 +EBUILD imagemagick-7.0.8.3.ebuild 5140 BLAKE2B 74b6c3c78f577c69ff89683178ff13eb658102dc029bdd40cae417c4183e69738de26f2a3d8da3976eaaaa3ad778bfda85358dfd93d4a09716d1710be1d3c282 SHA512 4e04c9ffcb86309f24b3a2df881cc604826db6123f54d4960db9afe6d2270eee725613994eef368a3481261ba2e02cbb64a7fdacd607181d73f9ee42ef2ded7a MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7 diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.43.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild index 52e77059cb1d..1d46b538e85c 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.9.43.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.10.3.ebuild @@ -3,9 +3,9 @@ EAPI=6 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator +inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver -MY_P=ImageMagick-$(replace_version_separator 3 '-') +MY_P=ImageMagick-$(ver_rs 3 '-') DESCRIPTION="A collection of tools and libraries for many image formats" HOMEPAGE="https://www.imagemagick.org/" @@ -38,7 +38,7 @@ RDEPEND=" perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) - raw? ( media-gfx/ufraw ) + raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( @@ -64,7 +64,7 @@ DEPEND="${RDEPEND} REQUIRED_USE="corefonts? ( truetype ) test? ( corefonts )" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" src_prepare() { local mesa_cards ati_cards nvidia_cards render_cards @@ -137,6 +137,7 @@ src_configure() { $(use_with openexr) $(use_with pango) $(use_with png) + $(use_with raw) $(use_with svg rsvg) $(use_with tiff) $(use_with webp) @@ -161,7 +162,7 @@ src_install() { DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ install - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} dodoc {AUTHORS,README}.txt ChangeLog if use perl; then diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.31.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild index 1db0353011d7..49b5b2b7bbd7 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.7.31.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.8.3.ebuild @@ -3,9 +3,9 @@ EAPI=6 -inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator +inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver -MY_P=ImageMagick-$(replace_version_separator 3 '-') +MY_P=ImageMagick-$(ver_rs 3 '-') DESCRIPTION="A collection of tools and libraries for many image formats" HOMEPAGE="https://www.imagemagick.org/" @@ -38,7 +38,7 @@ RDEPEND=" perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) - raw? ( media-gfx/ufraw ) + raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( @@ -64,7 +64,7 @@ DEPEND="${RDEPEND} REQUIRED_USE="corefonts? ( truetype ) test? ( corefonts )" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" src_prepare() { local ati_cards mesa_cards nvidia_cards render_cards @@ -137,6 +137,7 @@ src_configure() { $(use_with openexr) $(use_with pango) $(use_with png) + $(use_with raw) $(use_with svg rsvg) $(use_with tiff) $(use_with webp) @@ -161,7 +162,7 @@ src_install() { DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ install - rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} dodoc {AUTHORS,README}.txt ChangeLog if use perl; then diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest index 8701c6928731..2c63e3bcc7a5 100644 --- a/media-gfx/librecad/Manifest +++ b/media-gfx/librecad/Manifest @@ -1,5 +1,7 @@ +AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a2329dd4c3f445b40ea18a4a49614f2ee34114e1b6cc008b29e2dbd7b65c53340aaa447173f6f4d23d80e1a8809131aae7 SHA512 5e4ae43ac89fc8acf779fec9e062cac3896f0e41b0bf7fdab91ef128ab1a20a4ecda71ef332d9af7403f11a813323cc509e0682e5ffdf97786599271a2711f25 +DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c DIST librecad-2.1.3.zip 26086377 BLAKE2B 7f137c1f6c80f10b803ffbe8a739c230664d81003e47dc0f7b82509fdf0534e5fe046cbc6efaa75149daeaf6f0fa217c1fd08e4de83c74361c99108b6b8fd53a SHA512 9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009 EBUILD librecad-2.1.3-r2.ebuild 1239 BLAKE2B 39a94d6a4804a225549c5e4b7f74ebf79578bcff2a1189347694fd39673c2c73a5513a35fbe6cf5214b5a26d5b729d404dc6a46c98ac6aeb33ffe8b05cb6eef4 SHA512 05095a8861c0c884afe82a5637ad0218ff0ac6a2d68a7610c8a4e49dbed73e2845d7b33e93549cdd039f12fe2364b7fac8e0f0dd497c246f49230d67030812bb -EBUILD librecad-2.1.3-r3.ebuild 1241 BLAKE2B 2856c0a78d2dd5b3d43d7e1726be5258871e5eddb3dcdf79f34f9b3c31142f6b91c5fc8ec4cfdab7e1cad7f8fa012e2eaaa9cc19fa7bef4ee959b0c7212f174f SHA512 523de0503d2259089327399ff1fd3a1ffe73a8c3c024084bd07181714dca734fc16e8be49213c4fb3dafda0e12772b9ee12f36df0bb013a6857c9d83b9509f96 -EBUILD librecad-9999.ebuild 1184 BLAKE2B ccb254d96ec419c864da6ae95a37a6efce6e2dfc3e86d12f71fb4d5b5f6312a60792c7518edd01390c3110063d8b36c852d59210ecdc7d00b1c78b6b1d1a2c6a SHA512 8ab5110a9f847b221451da6de60b6b6ccc9f6fc694e77cdd4e3c8df67492a3cda7c11c21daffbd35ec4ba4f9755428c681d75a31e225dc18aa8d51372c006e28 +EBUILD librecad-2.1.3-r4.ebuild 1100 BLAKE2B 3c195be010dcd423a20493626dddba6f0fd8cb384b5fe0fe5c327ecd044735a1bdd5903440aa5596baea9a96f05c8c1dd1b81fc8626b842c8cf15168b62765e1 SHA512 2f3f4d7130ff2c20c5f1cadfa5eff37c90bc13cefb7e812adaf6c9e2bdc4eeb93f355f0a09e64d172e195994ee5c7a74970f07ec2bdb7d5330aa4b8645c73842 +EBUILD librecad-9999.ebuild 997 BLAKE2B c2f46819e1188ac08ff278385f696c578dac20c707b666d5fe297c2ff19b3f8c37f048e8c3083acacf4f7165378ed5f5de37209b6eff50fd73b8970dd7377b18 SHA512 8e8633998807024c30de31be9eb996b5a6abb1ab416247258e35b1497ea9824b7035556201b3a9c8c546cb3402406344353cfca37ce5d2fbe268bfaafe693b77 MISC metadata.xml 459 BLAKE2B 8b648b5abdd62d9df306c90d182164694c753231b16ad37319863ee37feac91b2e0fcc89212b5259a899287a638a68cb2e48fcc55af8a076d23b201e6b38ebb3 SHA512 108977904dfb070a16279d3306f40982a73b1cdddfa90e8ab22f83c4a75cd620a829fea9a56a0290d2d160b1d30fd0fb67e320f526726dd57a613e781c700b6c diff --git a/media-gfx/librecad/files/librecad-2.1.3-qt-5.11.patch b/media-gfx/librecad/files/librecad-2.1.3-qt-5.11.patch new file mode 100644 index 000000000000..0c61a66d8a1a --- /dev/null +++ b/media-gfx/librecad/files/librecad-2.1.3-qt-5.11.patch @@ -0,0 +1,40 @@ +From 6c392e903e162b9283e88f53006e929663f2e883 Mon Sep 17 00:00:00 2001 +From: Jiri Slaby <jslaby@suse.cz> +Date: Mon, 11 Jun 2018 10:44:00 +0200 +Subject: [PATCH] fix build with Qt 5.11 + +The new Qt removed some implicit inclusions of headers. To avoid build +errors, add explicit includes of those we use in the sources. + +Signed-off-by: Jiri Slaby <jslaby@suse.cz> +--- + librecad/src/ui/forms/qg_commandwidget.cpp | 1 + + librecad/src/ui/generic/colorwizard.cpp | 1 + + librecad/src/ui/generic/widgetcreator.cpp | 2 ++ + 3 files changed, 4 insertions(+) + +diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp +index 835e47d67..2c878e833 100644 +--- a/librecad/src/ui/forms/qg_commandwidget.cpp ++++ b/librecad/src/ui/forms/qg_commandwidget.cpp +@@ -27,6 +27,7 @@ + ** + **********************************************************************/ + #include "qg_commandwidget.h" ++#include <QAction> + #include <QKeyEvent> + #include <algorithm> + +diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp +index 7c35144ff..d51190842 100644 +--- a/librecad/src/ui/generic/widgetcreator.cpp ++++ b/librecad/src/ui/generic/widgetcreator.cpp +@@ -27,6 +27,8 @@ + #include "widgetcreator.h" + #include "ui_widgetcreator.h" + ++#include <QAction> ++#include <QActionGroup> + #include <QSettings> + #include <QLineEdit> + #include <QPushButton> diff --git a/media-gfx/librecad/librecad-2.1.3-r3.ebuild b/media-gfx/librecad/librecad-2.1.3-r4.ebuild index 52d397d7a4b8..f7542aac6ff3 100644 --- a/media-gfx/librecad/librecad-2.1.3-r3.ebuild +++ b/media-gfx/librecad/librecad-2.1.3-r4.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit eutils qmake-utils +inherit desktop qmake-utils DESCRIPTION="Generic 2D CAD program" HOMEPAGE="https://www.librecad.org/" -SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip" +SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -15,29 +15,24 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="3d debug doc tools" -DEPEND=" +RDEPEND=" dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 - dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 - dev-qt/qtxml:5 media-libs/freetype:2" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 + dev-qt/qthelp:5 + dev-qt/qtxml:5 +" -RDEPEND="${DEPEND}" S="${WORKDIR}/LibreCAD-${PV}" -src_prepare() { -# epatch "${FILESDIR}/iota-fix-2.1.1.patch" - - # currently RS_VECTOR3D causes an internal compiler error on GCC-4.8 - if ! use 3d; then - sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die - fi -} +PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) src_configure() { eqmake5 -r diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild index 2ab7e7f06f7f..4c0e87ee95e3 100644 --- a/media-gfx/librecad/librecad-9999.ebuild +++ b/media-gfx/librecad/librecad-9999.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit eutils git-r3 qmake-utils +inherit desktop git-r3 qmake-utils DESCRIPTION="Generic 2D CAD program" HOMEPAGE="https://www.librecad.org/" -SRC_URI="" EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git" LICENSE="GPL-2" @@ -16,25 +15,22 @@ KEYWORDS="" IUSE="3d debug doc tools" -DEPEND=" +RDEPEND=" dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 - dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 - dev-qt/qtxml:5 media-libs/freetype:2" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 + dev-qt/qthelp:5 + dev-qt/qtxml:5 +" -RDEPEND="${DEPEND}" -S="${WORKDIR}/librecad-${PV}" - -src_prepare() { - # currently RS_VECTOR3D causes an internal compiler error on GCC-4.8 - use 3d || sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die -} +S="${WORKDIR}/LibreCAD-${PV}" src_configure() { eqmake5 -r @@ -43,8 +39,6 @@ src_configure() { src_install() { dobin unix/librecad use tools && dobin unix/ttf2lff - insinto /usr/share - doins -r unix/appdata insinto /usr/share/${PN} doins -r unix/resources/* use doc && docinto html && dodoc -r librecad/support/doc/* diff --git a/media-gfx/openmesh/Manifest b/media-gfx/openmesh/Manifest index 10429beb5ef3..c5e6602cd211 100644 --- a/media-gfx/openmesh/Manifest +++ b/media-gfx/openmesh/Manifest @@ -1,3 +1,5 @@ DIST OpenMesh-4.1.tar.bz2 24728164 BLAKE2B 6be9876fccc8dbf53b6dddbaac09a3f241b2cffbcd98473f0f7caca23b634bdb0a0a8af808a178531c61e5d533597a4fd467b8b2928d9947a7f126990a4ee42a SHA512 064a4d5cb467589869baf4a302e6c620bd84de874b24019252b97ef863b59e83f2fe23ea45e4a5162a7765847da19f75f563f084cf2b3ae77c7e704b4c859b71 -EBUILD openmesh-4.1.ebuild 1733 BLAKE2B 1b9e8bd512ab3f2618d0d5d5540632cf8caba9f13d6eb2beabbaae3a3c10c28e8014049c88b64c976036b15bb525cc8e04b9eb2156c8674e31c49699b88c12dd SHA512 b46ef104b2581798f5e49e94f2369e07389523d9cc6b5455fd82f92efb5ab5524c1c080d5c7bfdd223cca0ffe1a28150f693492d48d4dffe2611c9fe3af70136 +DIST OpenMesh-7.1.tar.bz2 22855582 BLAKE2B 778b3a40c2e476cdb2f50b5b4a90f8b6ae7852f166087426ff1db25c829cb4172cd7ed14db1a22229f7b4447e7ebeb0d6116647d929b7dab43d565192a8ac48e SHA512 bca0f937e08fe512efb436f5b96b83a1ff7945640e18fb1bb083956f04609560e29b1c1f7e058840791df77df6859fdd20ff6f49d80b908e8c1c5542b8615e6d +EBUILD openmesh-4.1-r1.ebuild 1626 BLAKE2B 990da5a6c25fba6128088b29f7aa91e86c5e71a7c9765a9a58289995981134c45ad0d3f0064c02614284f639caaa45bdc0fa4f17010c4950087c39680f5d6d41 SHA512 ebf1e6ae7690859c09871da00e0a6fba8492baf6af3cda654ef2032bab705185d33bb617c60b2ef28d798d95246f5f2e870c66e68e247b1ba2b6a4241185b30a +EBUILD openmesh-7.1.ebuild 1440 BLAKE2B f4e59b2cbf50699f594dc958d9b02f5123c1aad2928807197dfe654faa0e76afb4208ddc42a89897f27c46c93e6a3eeb19606d196af70dd6ee9998afcc832e84 SHA512 2e0f3e49e0129f749260b4fc163cdc5d1b193d35b04976cf7d911e72de91b3a5927877fdafb563abe2859a4aad22b88819ae7d957c75550ed24dd3adfc456788 MISC metadata.xml 648 BLAKE2B 12598229d6cae71dae7cb87eac84679289994134848466d94c81d241db642f880c386a3ae65b0a5da939ae96cdd01eb19052ccf887f4df87edd3806526a3e225 SHA512 24e414a301d38d43961c5de285fc2fe2638a5a7c1d606d3f89efb5f701399d743382a0761f72f4aaf1d143755349a5a0f0cd49171a36137f65c1b7b8d3ccdcef diff --git a/media-gfx/openmesh/openmesh-4.1.ebuild b/media-gfx/openmesh/openmesh-4.1-r1.ebuild index 212d2d93cb76..b72c8c6a8d1a 100644 --- a/media-gfx/openmesh/openmesh-4.1.ebuild +++ b/media-gfx/openmesh/openmesh-4.1-r1.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" -inherit eutils cmake-utils +EAPI=6 + +inherit cmake-utils MY_PN="OpenMesh" MY_PV="${PV/_rc/-RC}" S="${WORKDIR}/${MY_PN}-${MY_PV}" DESCRIPTION="A generic data structure to represent and manipulate polygonal meshes" -HOMEPAGE="http://www.openmesh.org/" -SRC_URI="http://openmesh.org/media/Releases/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.tar.bz2" +HOMEPAGE="https://www.openmesh.org/" +SRC_URI="https://openmesh.org/media/Releases/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.tar.bz2" LICENSE="BSD" SLOT="4" @@ -18,11 +19,19 @@ KEYWORDS="~amd64 ~ia64 ~x86" IUSE="qt5 static-libs test" RDEPEND=" - qt5? ( dev-qt/qtgui:5 + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 dev-qt/qtopengl:5 - media-libs/freeglut )" + dev-qt/qtwidgets:5 + media-libs/freeglut + ) +" DEPEND="${RDEPEND} - test? ( dev-cpp/gtest )" + test? ( dev-cpp/gtest ) +" + +DOCS=( LICENSE/{LICENSE,README.txt} README CHANGELOG ) src_prepare() { cmake-utils_src_prepare @@ -44,26 +53,17 @@ src_prepare() { } src_configure() { - mycmakeargs="" - - mycmakeargs="${mycmakeargs} -DOPENMESH_BUILD_UNIT_TESTS=TRUE" - - # Disable python bindings until someone wants them. - mycmakeargs="${mycmakeargs} -DOPENMESH_BUILD_PYTHON_BINDINGS=FALSE" - mycmakeargs="${mycmakeargs} -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=FALSE" - - if ! use qt5; then - mycmakeargs="${mycmakeargs} -DBUILD_APPS=OFF" - fi + local mycmakeargs=( + -DOPENMESH_BUILD_UNIT_TESTS=TRUE + # Disable python bindings until someone wants them. + -DOPENMESH_BUILD_PYTHON_BINDINGS=FALSE + -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=FALSE + -DBUILD_APPS=$(usex qt5) + ) cmake-utils_src_configure } -src_install() { - cmake-utils_src_install - dodoc LICENSE/* README CHANGELOG -} - src_test() { cd "${BUILD_DIR}" || die LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${BUILD_DIR}/Build/$(get_libdir) ctest --verbose diff --git a/media-gfx/openmesh/openmesh-7.1.ebuild b/media-gfx/openmesh/openmesh-7.1.ebuild new file mode 100644 index 000000000000..9cc6fc78dcce --- /dev/null +++ b/media-gfx/openmesh/openmesh-7.1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +MY_PN="OpenMesh" +MY_PV="${PV/_rc/-RC}" +S="${WORKDIR}/${MY_PN}-${MY_PV}" + +DESCRIPTION="A generic data structure to represent and manipulate polygonal meshes" +HOMEPAGE="https://www.openmesh.org/" +SRC_URI="https://openmesh.org/media/Releases/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.tar.bz2" + +LICENSE="BSD" +SLOT="4" +KEYWORDS="~amd64 ~ia64 ~x86" +IUSE="qt5 static-libs test" + +RDEPEND=" + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + media-libs/freeglut + ) +" +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest ) +" + +src_prepare() { + cmake-utils_src_prepare + + # Fix libdir and remove rpath. + sed -i \ + -e "s|\(set (ACG_PROJECT_LIBDIR \"\).*|\1$(get_libdir)/\")|" \ + -e "s|\(BUILD_WITH_INSTALL_RPATH \)1|\1 0|" \ + -e "s|\(SKIP_BUILD_RPATH\) 0|\1 1|" \ + -e '/^ *INSTALL_RPATH/d' \ + cmake/ACGCommon.cmake || die + + if ! use static-libs; then + sed -i "s|\(SHARED\)ANDSTATIC|\1|" \ + src/${MY_PN}/{Core,Tools}/CMakeLists.txt || die + sed -i '/OpenMeshCoreStatic/d' \ + src/${MY_PN}/Tools/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_APPS=$(usex qt5) + -DOPENMESH_BUILD_UNIT_TESTS=$(usex test) + ) + + cmake-utils_src_configure +} + +src_test() { + cd "${BUILD_DIR}" || die + LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${BUILD_DIR}/Build/$(get_libdir) ctest --verbose +} diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest index 921b627f1428..37b63ddf41b5 100644 --- a/media-gfx/qiv/Manifest +++ b/media-gfx/qiv/Manifest @@ -1,5 +1,4 @@ -DIST qiv-2.2.4.tgz 98874 BLAKE2B 150ea07881d8225801156d395696cef397210e1f5c2f974d08197f3429e1a7e19ebf283037b92cec40a973aa6748f1562dbeba1a6e854438cf069c70781e1561 SHA512 744014ff70c9397d7a90e60740f482976713c9e5ff295a03684ae7b50ae70b86589d9e9066702fd43241bf2767c3537f582aab5ebbde25caea1663ec825f76a5 -DIST qiv-2.3.1.tgz 130621 BLAKE2B 7aa3a63fb83094d4b0a15c4d6422ccf35f34a16df2f0e644a2068c520024b2a22f724ed117ef90292359fb8372969511863b6b0a2ccb0d208bad12649333f993 SHA512 5a9b8ac082c78071c903e2f10a98effc412c0b6b940437b6592077978de03b5c7b6192e4d696f0389c12e99e0d3b5ca40c3be54ca2dfa5439121af2415f32812 -EBUILD qiv-2.2.4.ebuild 832 BLAKE2B 9f31559012ef78a27af6d3c34ad28f4bd4634f0310545c843216c39303a5870cd661ad4946d7d087b73c0714ca04a221d884f62b6ea488075ba89f320a898c63 SHA512 610f4ac7c6d976fa7534b23df722853509286eb49e96baf713224dc2a82369863b3715c0f09ca8420de6c6b46157191ab840e7a2e4299f56556a7099625ef48f -EBUILD qiv-2.3.1.ebuild 1208 BLAKE2B bd74cf3416a8070ab0c8efc258a129ef478b396ce5df909b3058e676f3cef7ba12767a383c640c4b284c400edc13ecd29ef27ca4c92731815db03984aafea5d1 SHA512 1fe7f0872b04f8ad2702352d3d3e6108cade7eef3aa9ffff905291d48ee6cd65a8559c47f984f5961bf6773d553a1aff2e0735db937ad536a79dcac700584356 -MISC metadata.xml 338 BLAKE2B f7a1f5b1fc91ac9b68c24947274a0182ed76c498d31ca614e09dd24061e14fd2b9dc121435bd3d8e067de6f5346d93c8806d1a004c13bcb8a8eca359b73ab05a SHA512 67b1a99367a1b89fdcf2b8775b69a516e0cd4f2135f5071998049a21613b4237df7a578682534d6a40a418c9653e417a3177256a074ebb3a3cfac6ada429c757 +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 +MISC metadata.xml 419 BLAKE2B 91296f38a94e37a97e1925e348d13de307b5d72e78002e3e5e396658b8ab4f96c909c530947a154317f0e354063f36c8ea4093efed599ed6ffe3c9089827cdea SHA512 d9ae3b413f335a277b97e98ca245a3ffe1982cd777c08062ac43642f76cd8b567b815163738807ff5a826ef1c14ca24e20ae1041394db6b998f02fdd2dbad216 diff --git a/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch b/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch new file mode 100644 index 000000000000..e00ad10f93e2 --- /dev/null +++ b/media-gfx/qiv/files/qiv-2.3.2-optional-tiff.patch @@ -0,0 +1,22 @@ +Make tiff header usage conditional on LCMS support as intended. + +--- ciberandy-qiv-14b562fe2fc3/qiv.h ++++ ciberandy-qiv-14b562fe2fc3/qiv.h +@@ -12,6 +12,7 @@ + #ifdef SUPPORT_LCMS + #include <lcms2.h> + #include <jpeglib.h> ++#include <tiffio.h> + #endif + + /* +--- ciberandy-qiv-14b562fe2fc3/utils.c ++++ ciberandy-qiv-14b562fe2fc3/utils.c +@@ -17,7 +17,6 @@ + #include <dirent.h> + #include <fcntl.h> + #include <errno.h> +-#include <tiffio.h> + #include <X11/extensions/dpms.h> + #ifdef HAVE_EXIF + #include <libexif/exif-loader.h> diff --git a/media-gfx/qiv/metadata.xml b/media-gfx/qiv/metadata.xml index 9cc5dff0ad50..55247542f391 100644 --- a/media-gfx/qiv/metadata.xml +++ b/media-gfx/qiv/metadata.xml @@ -8,4 +8,7 @@ <use> <flag name="magic">Use libmagic to determine mimetypes</flag> </use> + <upstream> + <remote-id type="bitbucket">ciberandy/qiv</remote-id> + </upstream> </pkgmetadata> diff --git a/media-gfx/qiv/qiv-2.2.4.ebuild b/media-gfx/qiv/qiv-2.2.4.ebuild deleted file mode 100644 index f26a883e40e5..000000000000 --- a/media-gfx/qiv/qiv-2.2.4.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -inherit toolchain-funcs - -DESCRIPTION="Quick Image Viewer" -HOMEPAGE="http://spiegl.de/qiv/" -SRC_URI="http://spiegl.de/qiv/download/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~mips ~x86" -IUSE="xinerama" - -RDEPEND=">=x11-libs/gtk+-2.12:2 - media-libs/imlib2[X] - !<media-gfx/pqiv-0.11 - xinerama? ( x11-libs/libXinerama )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - sed -i \ - -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \ - Makefile || die - - if ! use xinerama; then - sed -i \ - -e 's:-DGTD_XINERAMA::' \ - Makefile || die - fi -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - -src_install() { - dobin qiv - doman qiv.1 - dodoc Changelog qiv-command.example README README.TODO -} diff --git a/media-gfx/qiv/qiv-2.3.1.ebuild b/media-gfx/qiv/qiv-2.3.2.ebuild index 99141eb1eca7..0b0984e667e7 100644 --- a/media-gfx/qiv/qiv-2.3.1.ebuild +++ b/media-gfx/qiv/qiv-2.3.2.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils gnome2-utils toolchain-funcs xdg-utils +EAPI=6 +inherit desktop gnome2-utils toolchain-funcs xdg-utils vcs-snapshot DESCRIPTION="Quick Image Viewer" -HOMEPAGE="http://spiegl.de/qiv/" -SRC_URI="http://spiegl.de/qiv/download/${P}.tgz" +HOMEPAGE="http://spiegl.de/qiv/ https://bitbucket.org/ciberandy/qiv" +SRC_URI="https://bitbucket.org/ciberandy/qiv/get/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -16,12 +16,20 @@ IUSE="exif lcms magic" RDEPEND=">=x11-libs/gtk+-2.12:2 media-libs/imlib2[X] exif? ( media-libs/libexif ) - lcms? ( media-libs/lcms:2 ) + lcms? ( + media-libs/lcms:2 + media-libs/tiff:0 + virtual/jpeg:0 + ) magic? ( sys-apps/file )" DEPEND="${RDEPEND} virtual/pkgconfig" +PATCHES=( "${FILESDIR}"/${P}-optional-tiff.patch ) + src_prepare() { + default + sed -i \ -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \ Makefile || die |