diff options
Diffstat (limited to 'media-gfx/sane-frontends')
| -rw-r--r-- | media-gfx/sane-frontends/Manifest | 2 | ||||
| -rw-r--r-- | media-gfx/sane-frontends/sane-frontends-1.0.14-r2.ebuild (renamed from media-gfx/sane-frontends/sane-frontends-1.0.14-r1.ebuild) | 41 |
2 files changed, 22 insertions, 21 deletions
diff --git a/media-gfx/sane-frontends/Manifest b/media-gfx/sane-frontends/Manifest index 794629b6517e..69102b335d20 100644 --- a/media-gfx/sane-frontends/Manifest +++ b/media-gfx/sane-frontends/Manifest @@ -1,5 +1,5 @@ AUX MissingCapsFlag.patch 417 BLAKE2B 5382644f1c8af41fb383bf9889528f279bbac0a18ee2e38f080769b653f24fc02dec53f88f364441d8ceb6d401ad70137215627a181434f6cfcf8245a1d6c37c SHA512 39790a52414a7edcfc4dd9379bd8f35ce91e932209ba9c2ab3f1cb9e5dd140b37f3bfed1e642050a142da43ae435329ab60e201f2934be76648380615a3f37ef DIST sane-frontends-1.0.14.tar.gz 231892 BLAKE2B 3d3af2ded774fa90ba4b9545a00df1f036fc72edb71a69f803dde84ca1e9d37b4d20ac91d046ce702c31eb7353d2d85b91cbf8bd53b84adea7f2e58f8be1a062 SHA512 51b24a9bd6889e99419c1d6abb30cb14d8f89b6196c5147044697bdb1b39ee029bdc0d7c6e1f1e800491988aa26f658bc974b25040c49d008ca8977673c78710 -EBUILD sane-frontends-1.0.14-r1.ebuild 1386 BLAKE2B db6b17f2c9109f55ef826f26606ef81593160e1db9c54374361dd762887d642ae65f9fd8eec2b48e41d0777bdbf5456558e27df294a1f56178a2d297082e6181 SHA512 01f6cda1eb98c511aab5445ec580df175e0bc8f6498c7693916a3931b714d926640797d2bfab5119b7487f3684ac7f132f8a4112f1fb9768a1b75ce9d4b1f88f +EBUILD sane-frontends-1.0.14-r2.ebuild 1286 BLAKE2B 6b1c2b42d8feaacea6cbafe390c85c7116940982629a724d304cf2f87d2db513e48ea997b381cd6a97aa663bcf5fc411a5623b3f37252fe7de85e484511c97b5 SHA512 587922a1f9afcc87306691790a423858de48418bb51938faae27070eb16a282dbc29fa6c638962fba875ec76c259003e378c7788c916369abbfb6f94403af27f EBUILD sane-frontends-1.0.14.ebuild 1430 BLAKE2B 9f579d1cc997961f304479a4070f2630fb0e34cfb128b64671ad4278b1fe4fd52ab227cbdb51941a04eb10051a19b1dc9ece6233e452b62f19e177afe4d79ec7 SHA512 0f433d8f9915d2ba644b3d76e04e9b3bd208a8c9f3c62067203e0e5b571deab87f2577114f846143d3ca860ecfca9b383a8a3d0f470047009754ae0853ca4e30 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/media-gfx/sane-frontends/sane-frontends-1.0.14-r1.ebuild b/media-gfx/sane-frontends/sane-frontends-1.0.14-r2.ebuild index 26cd1d46586c..3bfba7d3acf0 100644 --- a/media-gfx/sane-frontends/sane-frontends-1.0.14-r1.ebuild +++ b/media-gfx/sane-frontends/sane-frontends-1.0.14-r2.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils - DESCRIPTION="Scanner Access Now Easy" HOMEPAGE="http://www.sane-project.org" SRC_URI="ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz @@ -12,43 +10,46 @@ SRC_URI="ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~ppc ~ppc64 sparc ~x86" IUSE="gimp" -RDEPEND="" -DEPEND="media-gfx/sane-backends - gimp? ( media-gfx/gimp )" +RDEPEND=" + dev-libs/glib:2 + x11-libs/gtk+:2 +" +DEPEND="${RDEPEND} + media-gfx/sane-backends + gimp? ( media-gfx/gimp:2 ) +" + +DOCS=( AUTHORS Changelog NEWS PROBLEMS README ) PATCHES=( "${FILESDIR}/MissingCapsFlag.patch" ) -src_configure () { - local myconf="" - use gimp || myconf="--disable-gimp" - use gimp && ! has_version ">=media-gfx/gimp-2" && myconf="--enable-gimp12" +src_configure() { econf \ --datadir=/usr/share/misc \ - ${myconf} - emake + $(use_enable gimp) } -src_install () { +src_install() { local gimpplugindir local gimptool emake DESTDIR="${D}" install if use gimp; then - for gimptool in gimptool gimptool-2.0 gimptool-1.2; do - if [ -x /usr/bin/${gimptool} ]; then + for gimptool in gimptool gimptool-2.0; do + if [[ -x /usr/bin/${gimptool} ]]; then einfo "Setting plugin link for GIMP version $(/usr/bin/${gimptool} --version)" gimpplugindir=$(/usr/bin/${gimptool} --gimpplugindir)/plug-ins break fi done - if [ "/plug-ins" != "${gimpplugindir}" ]; then - dodir ${gimpplugindir} - dosym /usr/bin/xscanimage ${gimpplugindir}/xscanimage + if [[ "/plug-ins" != "${gimpplugindir}" ]]; then + dodir ${gimpplugindir} + dosym xscanimage ${gimpplugindir}/xscanimage else ewarn "No idea where to find the gimp plugin directory" fi fi - dodoc AUTHORS Changelog NEWS PROBLEMS README + einstalldocs } |