ulm 15/03/15 18:13:54
Modified: ghostscript-gpl-9.10-r2.ebuild metadata.xml
ChangeLog ghostscript-gpl-9.15-r1.ebuild
ghostscript-gpl-9.10-r4.ebuild
Log:
Add conditional bindist restriction and remove bindist USE flag, bug 541412.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
9433907D693FB5B8!)
Revision Changes Path
1.12 app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild?rev=1.12&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild?rev=1.12&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild?r1=1.11&r2=1.12
Index: ghostscript-gpl-9.10-r2.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ghostscript-gpl-9.10-r2.ebuild 10 Jun 2014 01:04:39 -0000 1.11
+++ ghostscript-gpl-9.10-r2.ebuild 15 Mar 2015 18:13:54 -0000 1.12
@@ -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 @@
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 @@
>=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 @@
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 @@
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 @@
$(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 @@
# 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
1.4 app-text/ghostscript-gpl/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/ghostscript-gpl/metadata.xml?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/ghostscript-gpl/metadata.xml?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/ghostscript-gpl/metadata.xml?r1=1.3&r2=1.4
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml 12 Nov 2011 10:21:37 -0000 1.3
+++ metadata.xml 15 Mar 2015 18:13:54 -0000 1.4
@@ -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>
1.178 app-text/ghostscript-gpl/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/ghostscript-gpl/ChangeLog?rev=1.178&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/ghostscript-gpl/ChangeLog?rev=1.178&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/ghostscript-gpl/ChangeLog?r1=1.177&r2=1.178
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- ChangeLog 9 Nov 2014 13:51:18 -0000 1.177
+++ ChangeLog 15 Mar 2015 18:13:54 -0000 1.178
@@ -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 <[email protected]> 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)
1.2 app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild?r1=1.1&r2=1.2
Index: ghostscript-gpl-9.15-r1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.15-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghostscript-gpl-9.15-r1.ebuild 9 Nov 2014 13:51:18 -0000 1.1
+++ ghostscript-gpl-9.15-r1.ebuild 15 Mar 2015 18:13:54 -0000 1.2
@@ -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 @@
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 @@
>=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 @@
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 @@
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 @@
$(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_install() {
emake DESTDIR="${D}" install-so install
- if ! use bindist && use djvu ; then
+ if use djvu ; then
dobin gsdjvu
fi
1.2 app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild?r1=1.1&r2=1.2
Index: ghostscript-gpl-9.10-r4.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ghostscript-gpl-9.10-r4.ebuild 9 Nov 2014 13:51:18 -0000 1.1
+++ ghostscript-gpl-9.10-r4.ebuild 15 Mar 2015 18:13:54 -0000 1.2
@@ -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 @@
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 @@
>=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 @@
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 @@
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 @@
$(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 @@
# 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
