Add conditional bindist restriction and remove bindist USE flag, bug 541412.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 9e1bc6c67e999f05f4a554866cd5084b0a22c9d1..b98ab519a8117f638ff66b19660b1c66f33f2f02 100644 (file)
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/ghostscript-gpl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.177 2014/11/09 13:51:18 tamiko Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.178 2015/03/15 18:13:54 ulm Exp $
+
+  15 Mar 2015; Ulrich Müller <ulm@gentoo.org> ghostscript-gpl-9.10-r2.ebuild,
+  ghostscript-gpl-9.10-r4.ebuild, ghostscript-gpl-9.15-r1.ebuild, metadata.xml:
+  Add conditional bindist restriction and remove bindist USE flag, bug 541412.
 
 *ghostscript-gpl-9.10-r4 (09 Nov 2014)
 *ghostscript-gpl-9.15-r1 (09 Nov 2014)

diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index fad91578f082c025e95300bb2e74040d86c458e7..f79799cf0932ad4f04409dfdafae728b3b54af6a 100644 (file)
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -6,25 +6,22 @@ DIST ghostscript-9.15.tar.bz2 28826065 SHA256 e65daf25059e2f3dabd3535df3d936a42c
 DIST ghostscript-gpl-9.10-patchset-1.tar.bz2 5099 SHA256 f5b515295db2ad70a196ff2aee382d1a01c471ba64671f5b05f504f1109c97c1 SHA512 ae984dae5c426c488480c7c3f0e2eaf473c521c47b968ee91880264f5dbf1df8d992398bbf4dfdc82763953a9ad681c098da3561b203e596ed1ac0edc35d84da WHIRLPOOL c3b353f6f102dd79e229a92770720e50729228baaea950a2b5364541631958616b2d3d55c584875efd75f6c31a5b787bdba87ce452779ec9040966e6019a463d
 DIST ghostscript-gpl-9.12-patchset-1.tar.bz2 4940 SHA256 5c0e99a192a6d0e142c4c5f38a2d80ceeeb4a8e2265264d31360b06f3d94e0b5 SHA512 e3daf758c75ecb6a38dbece91b0f44ae06985920080b376384a9b3ad2ad35295530c144832158af2933d5fc49782c1fc6733efc60106193499c615a502f5e656 WHIRLPOOL e9436e1681e95a4b578a9de577d9b487ad119893c141baf840cd5dae0b89f5eedbde6d2f1225fb97c425a6dc3f3fb7f1ea6a02ab02b799438c3002fb933575c6
 DIST gsdjvu-1.6.tar.gz 207122 SHA256 6236b14b79345eda87cce9ba22387e166e7614cca2ca86b1c6f0d611c26005df SHA512 57f3866f1f863fa31f066b45ee679cfbdf2c6a9bec922f24fa9f50dd3ea52f192b4c9889b0c9657e96ca9e3528d3fea7dcc53b4d1ea87dd49d138ce9c9684884 WHIRLPOOL 66e5222412d9da2d616ba0a3f73548d031b3e6726eff7bc60bea703b02ce4d22e100adad1faf3fabaac379b4ef8324324eabb8b5320f74ebafe929b577dd6c8d
-EBUILD ghostscript-gpl-9.10-r2.ebuild 5970 SHA256 bdc93788d9377e3476f29b914bc802ace67588e3f3b319903e889731092e5092 SHA512 c0c4941931d252bae13cbb0152fc0eeca4509e91c485c5145542687468c5666cf42273829d0da7f02c887615a9966c984f0a0ce9f643ea4801d3851f6cd123e9 WHIRLPOOL 6fb4cbc50d434762ed92b73e4aee3e76d34c66a628868231b10b433a8b076a1d6828325ac53c01be573b2c1545f514843d4f0ac33c36773b2d1e92ca64c90629
-EBUILD ghostscript-gpl-9.10-r4.ebuild 6014 SHA256 92f79612cac8f1e83b0e323b3a2e3b13909de2210b4f9de15f259214ef781136 SHA512 d63e243f82fa80b1f62fee2966376fcb0debd8c567121a54b5365ee28328177798a40a1a421d37486b123a54faedfd13dd7f8feb47c089e71705379395387dad WHIRLPOOL fd8f36406289e13c773372bbe839b97c4ebf4f535dbe6274766e986fef7971d0fbc131282ceff60cadde61bd42c984f9fa46276adf19b96208b1bc3c1bdac797
-EBUILD ghostscript-gpl-9.15-r1.ebuild 5933 SHA256 08cd541ca08b6d0de325b76641c2922a876cc987cdddc1a00372eb32f672bd04 SHA512 ae571e4f5c20c49596b2094f01b9b0829e9b90f80cd9558ba15ea04889efa5064f60248e8054df186d7408f33d0021d64306b66fc23f65e4f375b6d69a664b61 WHIRLPOOL 21797b0ad1133c1c140c3cde770a42e55ed294f6038d9c7310d2b1ec0ce20d73e0cab113525e7499dc26e704e93c4026bcf35075d1e40670e520bcb5de14a410
-MISC ChangeLog 31435 SHA256 8a8ce5d5b704df5a25ba301d05b9165f244063e076b65ae3cad2a95d56f8cc30 SHA512 7005b0ae64b3277c783008dcb003c93cc0bc8640b6a3317478f3de41a673aa7a9511fc050ee519c4b7eee40773d29301994448dff622ccb20bcf6e126d286b67 WHIRLPOOL d05e81cffc0193af61b60cb100ce20e126565c7afb9421f62e1ea7f30a3c223e08297afd1612e206c9f8cf1ce32daa0ea459b98abc0f63a56d4b85481106680f
-MISC metadata.xml 281 SHA256 8f54c529127270fee6cdc9e4db328d9403ff2183d2ce21317932c17fd58ad0d0 SHA512 bef432e957e5d7798630807a1398736811461b1e6b8f622125843e3b818256bc980a77b0e033f267b30ad30282ab4d158ca27433f59df868ef769e258526697b WHIRLPOOL 740da3c76002cb8712cac28a28851d529725ed4a18f486009e2f36f55155afa21103479f7975aa9fba8fe45195a048d3b5d756db7ed3a848e5f60a7b150d1f8f
+EBUILD ghostscript-gpl-9.10-r2.ebuild 5859 SHA256 05beead85668de5eeb3aaae4b604757ad5f8cddd1e6f859fe4b140a92565908a SHA512 539e3240dad7f7d74f39feec11ba6d2549723acc562f953739ee918ae5c5173328b0ef40947c31dd107d47e76de4b63aee2be72797abc5af5f2ccde42685df3f WHIRLPOOL 1bb30e762d6011daeb9a4b48c4c73e8d0c3f73a8d8337723a2402c1d6828931f1620ad2dd0d9b7d6e73d818310ecc307b46af57463eacf8ea1942c0d01aa61ed
+EBUILD ghostscript-gpl-9.10-r4.ebuild 5903 SHA256 da3969b443761877bd3477fee72cda8213f0d2860deb030eaccaab646692dc2a SHA512 5771a2178370dbccde278052c2acba897a32006b8e81adfa61418e0ed4d48dd0c46fa15b1cd5372dfba752d63800f51161d57122de31be70d15d266deb2ec356 WHIRLPOOL 8e7aab30ed4f491d146c8cf52fcfb09ed3d5e40bfedfbec144206ae239c6dee3c536b5ae56c6f258ae969ad395bcf6de2e4945ed2caa8a631027aa5aeb2bb717
+EBUILD ghostscript-gpl-9.15-r1.ebuild 5822 SHA256 d3687bd054194cddf626d6f4e6b5ce73d1df1a7ec00b945a7246ab09cd97da85 SHA512 3402eb46946e19944ce93436886ba544b2c22935114c01eff4203c55911b615aa986db43384b1374a12f8e8eb75fe121a32fe5a6d67644467974665889cabd81 WHIRLPOOL d6217673b922a39ac1ead54716cd6c76439b7fbf41b1420f248a28d88db21fc447991020c834ae479612c298e8721938d94315b5817522f8fce6ce67b10427a6
+MISC ChangeLog 31671 SHA256 e3254b4944d4526aa662ba382108785a5411c7e96695a9866dae6efc2a447adc SHA512 c5b44ffe3decfcb27cba2a67a0e4afe60caadc50369166db3442adaf0e1d815e532e2b60b50b884c2066ff82874b4b831904671f7f012d9c4674352998ae0d49 WHIRLPOOL 89f8c27ac42ad3d5627b5903f811a8903f53e969269cb5718f5d8bd9874b44b28bcf5c61f3177fcaa14c0db645af84d27b1b3186b62ad4b3bb7b954640cf816a
+MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUX3FXAAoJELhOzYlK7nn/LTAQAMDn4gFfIpMH7XbOMj6ignaf
-NQV+5MyiZXN4UqTdACfHBhyu6HxB55j/EJFBp5OMSjHcvXsvuazjql/Vcbo2M5AP
-afxJTrfT2jeIqp5ZEVGgu10IrSJKoa7ij/mZBYB9oCOtT86V+Ak3Q2ZxCf9hMddf
-qDgXY/Jpgl+5eDsc46dKURdGTW6eFjLfxr7HLveMNFZOWYlnJuKMf/PUtvcPPmhk
-KxUxabpMPVc0KvgI/jBmzuA6bogH/mK4SySkGNccTbLYhFwV1ijDY/j3IXY/B6fh
-jEr3ek7hQ8YdOnqJPYEhXCpBJ5QT7FgPGaj70x7epxSpAguvckMmVFFhKZURzTCV
-3e9UhVh3bpqhfJ4a+UJU6Tr/j+xcqjGwPm28Z7CQMbXzKPQJpdjpkkHxR8MebPWQ
-zSAtm6tXwi1wK6qPf9wJDbKp0aVAt8fZTUpDFoMCeTAm8X1MFcgp9sF1x11TJFvY
-1w0DU8zbxQzdjphQEkvFeC5ozYUhzKur+vzf8RBuY39223hS4CGcjkw+6fqqBTuo
-S/HXuuurkCp7JBJNGdUSHrL1jnDcm2+HFRc+0xpRElTUMhrpXR0bz1XQAcSd/Tz1
-rpyABpBftu5mjirKcf5PKU1PBoJa+voc18djmHJOx9vqywpq+Pyf8zlyCyzCEd7A
-HR+Iek1P6UzzMUbi7cgN
-=yEXp
+iQGcBAEBCAAGBQJVBcvuAAoJEJQzkH1pP7W45fgL/04/R+tsX03gf++r036nOVZZ
+ZojmGtmZzPvwrT1bHIz92xG4Hp5I1G8O/zxZX48MolgF5Uv5yQtM6jphJiCRAiZM
+5e16DIA5wwCVGNI4T7YkRcgXXdcxY43Z2hRuPaDGSct75qlIKB3Ao2JQh43jlsRR
+r/hF4BOVYzde3EGgvmukUDd/sKOzdL/fgiCUvf/TQz9ztN/KUdrfFymuTv5kQjsV
+tI4SmIB35Jvl/VCtx6fiLzZWOX+BndPdK2n2Z0fNtTUKh1wmEYLCK6Mr3J1Y9d0h
+DRJrnnzNYjJF30IX4cJXI1EmiKdG4O5wroQncZaBEeUR8GZGHj93AJ13XktxKEOp
+/nm/qidExABmnV+ulptaQY0HN6/0OKKOKJRMqpbf6SHv9+/ea7mAqTNz22ripQwc
+692kwkzY5QOd9+t4gL0BWkqfmep/HzpuCgfR/sipr5X/YVjtBJMVfRzW4KltljF9
+BqTcNeuEv8uqYcT0dRtn4rH/UhvEV6VGmQKDJuE+7Q==
+=w5ej
 -----END PGP SIGNATURE-----

diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild
index cfbcc1518be3dd661ac5bf0e8814c8a2fe23e7b9..5c24f65b080d0334473cf3d7b57fc317ff52944d 100644 (file)
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild,v 1.11 2014/06/10 01:04:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild,v 1.12 2015/03/15 18:13:54 ulm Exp $
 
 EAPI=5
 
@@ -15,12 +15,12 @@ PVM=$(get_version_component_range 1-2)
 SRC_URI="
        mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
        mirror://gentoo/${PN}-9.10-patchset-1.tar.bz2
-       !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
+       djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz )"
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist cups dbus djvu gtk idn linguas_de static-libs X"
+IUSE="cups dbus djvu gtk idn linguas_de static-libs X"
 
 COMMON_DEPEND="
        app-text/libpaper
@@ -32,9 +32,9 @@ COMMON_DEPEND="
        >=media-libs/tiff-4.0.1:0=
        >=sys-libs/zlib-1.2.7:=
        virtual/jpeg:0
-       !bindist? ( djvu? ( app-text/djvu ) )
        cups? ( >=net-print/cups-1.3.8 )
        dbus? ( sys-apps/dbus )
+       djvu? ( app-text/djvu )
        gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
        idn? ( net-dns/libidn )
        X? ( x11-libs/libXt x11-libs/libXext )
@@ -64,8 +64,8 @@ for X in ${LANGS} ; do
 done
 
 pkg_setup() {
-       if use bindist && use djvu; then
-               ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
+       if use djvu; then
+               ewarn "With USE=\"djvu\", distribution of binaries is restricted!"
                ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
        fi
 }
@@ -92,7 +92,7 @@ src_prepare() {
        EPATCH_SOURCE="${WORKDIR}/patches/"
        epatch
 
-       if ! use bindist && use djvu ; then
+       if use djvu ; then
                unpack gsdjvu-${GSDJVU_PV}.tar.gz
                cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
                cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/base
@@ -164,7 +164,7 @@ src_configure() {
                $(use_with idn libidn) \
                $(use_with X x)
 
-       if ! use bindist && use djvu ; then
+       if use djvu ; then
                sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' \
                        "${S}"/Makefile || die "sed failed"
        fi
@@ -187,7 +187,7 @@ src_install() {
        # workaround: -j1 -> see bug #356303
        emake -j1 DESTDIR="${D}" install-so install
 
-       if ! use bindist && use djvu ; then
+       if use djvu ; then
                dobin gsdjvu
        fi
 

diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild
index 3bae6d55ebed611fbf35434df55dce06f6a69979..4f2345bfe27793441aca9a587e76f424d51c05bd 100644 (file)
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild,v 1.1 2014/11/09 13:51:18 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild,v 1.2 2015/03/15 18:13:54 ulm Exp $
 
 EAPI=5
 
@@ -15,12 +15,12 @@ PVM=$(get_version_component_range 1-2)
 SRC_URI="
        mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
        mirror://gentoo/${PN}-9.10-patchset-1.tar.bz2
-       !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
+       djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz )"
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist cups dbus djvu gtk idn linguas_de static-libs X"
+IUSE="cups dbus djvu gtk idn linguas_de static-libs X"
 
 COMMON_DEPEND="
        app-text/libpaper
@@ -32,9 +32,9 @@ COMMON_DEPEND="
        >=media-libs/tiff-4.0.1:0=
        >=sys-libs/zlib-1.2.7:=
        virtual/jpeg:0
-       !bindist? ( djvu? ( app-text/djvu ) )
        cups? ( >=net-print/cups-1.3.8 )
        dbus? ( sys-apps/dbus )
+       djvu? ( app-text/djvu )
        gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
        idn? ( net-dns/libidn )
        X? ( x11-libs/libXt x11-libs/libXext )
@@ -64,8 +64,8 @@ for X in ${LANGS} ; do
 done
 
 pkg_setup() {
-       if use bindist && use djvu; then
-               ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
+       if use djvu; then
+               ewarn "With USE=\"djvu\", distribution of binaries is restricted!"
                ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
        fi
 }
@@ -90,7 +90,7 @@ src_prepare() {
        EPATCH_SOURCE="${WORKDIR}/patches/"
        epatch
 
-       if ! use bindist && use djvu ; then
+       if use djvu ; then
                unpack gsdjvu-${GSDJVU_PV}.tar.gz
                cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
                cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/base
@@ -163,7 +163,7 @@ src_configure() {
                $(use_with idn libidn) \
                $(use_with X x)
 
-       if ! use bindist && use djvu ; then
+       if use djvu ; then
                sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' \
                        "${S}"/Makefile || die "sed failed"
        fi
@@ -186,7 +186,7 @@ src_install() {
        # workaround: -j1 -> see bug #356303
        emake -j1 DESTDIR="${D}" install-so install
 
-       if ! use bindist && use djvu ; then
+       if use djvu ; then
                dobin gsdjvu
        fi
 

diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
index 8b6d2d8dea4a1e0d8e9fd7fb0e668b8c086b45a6..03f7118cb580996e93f2ced99a38047071079256 100644 (file)
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild,v 1.1 2014/11/09 13:51:18 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild,v 1.2 2015/03/15 18:13:54 ulm Exp $
 
 EAPI=5
 
@@ -15,12 +15,12 @@ PVM=$(get_version_component_range 1-2)
 SRC_URI="
        http://downloads.ghostscript.com/public/${MY_P}.tar.bz2
        mirror://gentoo/${PN}-9.12-patchset-1.tar.bz2
-       !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
+       djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz )"
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist cups dbus djvu gtk idn linguas_de static-libs X"
+IUSE="cups dbus djvu gtk idn linguas_de static-libs X"
 
 COMMON_DEPEND="
        app-text/libpaper
@@ -32,9 +32,9 @@ COMMON_DEPEND="
        >=media-libs/tiff-4.0.1:0=
        >=sys-libs/zlib-1.2.7:=
        virtual/jpeg:0
-       !bindist? ( djvu? ( app-text/djvu ) )
        cups? ( >=net-print/cups-1.3.8 )
        dbus? ( sys-apps/dbus )
+       djvu? ( app-text/djvu )
        gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
        idn? ( net-dns/libidn )
        X? ( x11-libs/libXt x11-libs/libXext )
@@ -64,8 +64,8 @@ for X in ${LANGS} ; do
 done
 
 pkg_setup() {
-       if use bindist && use djvu; then
-               ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
+       if use djvu; then
+               ewarn "With USE=\"djvu\", distribution of binaries is restricted!"
                ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
        fi
 }
@@ -90,7 +90,7 @@ src_prepare() {
        EPATCH_SOURCE="${WORKDIR}/patches/"
        epatch
 
-       if ! use bindist && use djvu ; then
+       if use djvu ; then
                unpack gsdjvu-${GSDJVU_PV}.tar.gz
                cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
                cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/base
@@ -163,7 +163,7 @@ src_configure() {
                $(use_with idn libidn) \
                $(use_with X x)
 
-       if ! use bindist && use djvu ; then
+       if use djvu ; then
                sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' \
                        "${S}"/Makefile || die "sed failed"
        fi
@@ -185,7 +185,7 @@ src_compile() {
 src_install() {
        emake DESTDIR="${D}" install-so install
 
-       if ! use bindist && use djvu ; then
+       if use djvu ; then
                dobin gsdjvu
        fi
 

diff --git a/app-text/ghostscript-gpl/metadata.xml b/app-text/ghostscript-gpl/metadata.xml
index 115b76c17111443a8898fa0d738dbb8f01f6f7e2..e450ba260ec9db67824dae1e27f3aa18d87593cf 100644 (file)
--- a/app-text/ghostscript-gpl/metadata.xml
+++ b/app-text/ghostscript-gpl/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
        <herd>printing</herd>
-       <use>
-               <flag name="bindist">Disable dejavu support for binary distribution because of licensing issue</flag>
-       </use>
 </pkgmetadata>