* [gentoo-commits] gentoo-x86 commit in net-print/cups: cups-1.7.2-r1.ebuild cups-1.7.1-r2.ebuild cups-9999.ebuild ChangeLog
@ 2014-05-14 8:47 Michal Gorny (mgorny)
0 siblings, 0 replies; 3+ messages in thread
From: Michal Gorny (mgorny) @ 2014-05-14 8:47 UTC (permalink / raw
To: gentoo-commits
mgorny 14/05/14 08:47:24
Modified: cups-9999.ebuild ChangeLog
Added: cups-1.7.2-r1.ebuild cups-1.7.1-r2.ebuild
Log:
Enable multilib support, bug #493172.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.55 net-print/cups/cups-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?r1=1.54&r2=1.55
Index: cups-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- cups-9999.ebuild 15 Apr 2014 21:26:13 -0000 1.54
+++ cups-9999.ebuild 14 May 2014 08:47:24 -0000 1.55
@@ -1,14 +1,14 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.54 2014/04/15 21:26:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.55 2014/05/14 08:47:24 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
- multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd \
- toolchain-funcs
+ multilib multilib-minimal pam python-single-r1 user versionator \
+ java-pkg-opt-2 systemd toolchain-funcs
MY_P=${P/_rc/rc}
MY_P=${MY_P/_beta/b}
@@ -48,7 +48,7 @@
sys-apps/attr
)
)
- dbus? ( sys-apps/dbus )
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
java? ( >=virtual/jre-1.6 )
kerberos? ( virtual/krb5 )
!lprng-compat? ( !net-print/lprng )
@@ -57,19 +57,23 @@
selinux? ( sec-policy/selinux-cups )
ssl? (
gnutls? (
- dev-libs/libgcrypt:0
- net-libs/gnutls
+ dev-libs/libgcrypt:0[${MULTILIB_USEDEP}]
+ net-libs/gnutls[${MULTILIB_USEDEP}]
)
- !gnutls? ( >=dev-libs/openssl-0.9.8g )
+ !gnutls? ( >=dev-libs/openssl-0.9.8g[${MULTILIB_USEDEP}] )
)
usb? ( virtual/libusb:1 )
X? ( x11-misc/xdg-utils )
xinetd? ( sys-apps/xinetd )
- zeroconf? ( net-dns/avahi )
+ zeroconf? ( net-dns/avahi[${MULTILIB_USEDEP}] )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
"
DEPEND="${RDEPEND}
- virtual/pkgconfig
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
"
PDEPEND="
@@ -143,39 +147,45 @@
base_src_prepare
use systemd && epatch "${FILESDIR}/${PN}-1.7.2-systemd-socket-2.patch"
+ # Fix install-sh, posix sh does not have 'function'.
+ sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
AT_M4DIR=config-scripts eaclocal
eautoconf
+
+ # custom Makefiles
+ multilib_copy_sources
}
-src_configure() {
+multilib_src_configure() {
export DSOFLAGS="${LDFLAGS}"
einfo LANGS=\"${LANGS}\"
einfo LINGUAS=\"${LINGUAS}\"
- local myconf
+ local myconf=()
if use ssl ; then
- myconf+="
+ myconf+=(
$(use_enable gnutls)
$(use_enable !gnutls openssl)
- "
+ )
else
- myconf+="
+ myconf+=(
--disable-gnutls
--disable-openssl
- "
+ )
fi
if tc-is-static-only; then
- myconf+="
+ myconf+=(
--disable-shared
- "
+ )
fi
if use systemd; then
- myconf+="
+ myconf+=(
--with-systemdsystemunitdir="$(systemd_get_unitdir)"
- "
+ )
fi
econf \
@@ -187,24 +197,24 @@
--with-docdir="${EPREFIX}"/usr/share/cups/html \
--with-languages="${LINGUAS}" \
--with-system-groups=lpadmin \
- $(use_enable acl) \
+ $(multilib_native_use_enable acl) \
$(use_enable zeroconf avahi) \
$(use_enable dbus) \
$(use_enable debug) \
$(use_enable debug debug-guards) \
- $(use_enable kerberos gssapi) \
- $(use_enable pam) \
+ $(multilib_native_use_enable kerberos gssapi) \
+ $(multilib_native_use_enable pam) \
$(use_enable static-libs static) \
$(use_enable threads) \
- $(use_enable usb libusb) \
+ $(multilib_native_use_enable usb libusb) \
--disable-dnssd \
- $(use_with java) \
+ $(multilib_native_use_with java) \
--without-perl \
--without-php \
- $(use_with python python "${PYTHON}") \
- $(use_with xinetd xinetd /etc/xinetd.d) \
- --enable-libpaper \
- ${myconf}
+ $(multilib_native_use_with python python "${PYTHON}") \
+ $(multilib_native_use_with xinetd xinetd /etc/xinetd.d) \
+ $(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
+ "${myconf[@]}"
# install in /usr/libexec always, instead of using /usr/lib/cups, as that
# makes more sense when facing multilib support.
@@ -213,11 +223,27 @@
sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
}
-src_install() {
- # Fix install-sh, posix sh does not have 'function'.
- sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ default
+ else
+ emake libs
+ fi
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake BUILDROOT="${D}" install
+ else
+ emake BUILDROOT="${D}" install-libs install-headers
+ fi
+}
- emake BUILDROOT="${D}" install
+multilib_src_install_all() {
dodoc {CHANGES,CREDITS,README}.txt
# move the default config file to docs
1.610 net-print/cups/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.610&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.610&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.609&r2=1.610
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
retrieving revision 1.609
retrieving revision 1.610
diff -u -r1.609 -r1.610
--- ChangeLog 13 May 2014 15:20:28 -0000 1.609
+++ ChangeLog 14 May 2014 08:47:24 -0000 1.610
@@ -1,6 +1,13 @@
# ChangeLog for net-print/cups
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.609 2014/05/13 15:20:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.610 2014/05/14 08:47:24 mgorny Exp $
+
+*cups-1.7.2-r1 (14 May 2014)
+*cups-1.7.1-r2 (14 May 2014)
+
+ 14 May 2014; Michał Górny <mgorny@gentoo.org> +cups-1.7.1-r2.ebuild,
+ +cups-1.7.2-r1.ebuild, cups-9999.ebuild:
+ Enable multilib support, bug #493172.
13 May 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1-r1.ebuild:
Stable for ia64, wrt bug #507696
1.1 net-print/cups/cups-1.7.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild?rev=1.1&content-type=text/plain
Index: cups-1.7.2-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild,v 1.1 2014/05/14 08:47:24 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
multilib multilib-minimal pam python-single-r1 user versionator \
java-pkg-opt-2 systemd toolchain-funcs
MY_P=${P/_rc/rc}
MY_P=${MY_P/_beta/b}
MY_PV=${PV/_rc/rc}
MY_PV=${MY_PV/_beta/b}
if [[ ${PV} == *9999 ]]; then
inherit git-2
EGIT_REPO_URI="http://www.cups.org/cups.git"
if [[ ${PV} != 9999 ]]; then
EGIT_BRANCH=branch-${PV/.9999}
fi
KEYWORDS=""
else
SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
# KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
KEYWORDS=""
fi
DESCRIPTION="The Common Unix Printing System"
HOMEPAGE="http://www.cups.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="acl dbus debug gnutls java kerberos lprng-compat pam
python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
LANGS="ca es fr it ja ru"
for X in ${LANGS} ; do
IUSE="${IUSE} +linguas_${X}"
done
RDEPEND="
app-text/libpaper
acl? (
kernel_linux? (
sys-apps/acl
sys-apps/attr
)
)
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
java? ( >=virtual/jre-1.6 )
kerberos? ( virtual/krb5 )
!lprng-compat? ( !net-print/lprng )
pam? ( virtual/pam )
python? ( ${PYTHON_DEPS} )
selinux? ( sec-policy/selinux-cups )
ssl? (
gnutls? (
dev-libs/libgcrypt:0[${MULTILIB_USEDEP}]
net-libs/gnutls[${MULTILIB_USEDEP}]
)
!gnutls? ( >=dev-libs/openssl-0.9.8g[${MULTILIB_USEDEP}] )
)
usb? ( virtual/libusb:1 )
X? ( x11-misc/xdg-utils )
xinetd? ( sys-apps/xinetd )
zeroconf? ( net-dns/avahi[${MULTILIB_USEDEP}] )
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20140508
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)
"
DEPEND="${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
"
PDEPEND="
app-text/ghostscript-gpl[cups]
app-text/poppler[utils]
>=net-print/cups-filters-1.0.43
"
REQUIRED_USE="
gnutls? ( ssl )
python? ( ${PYTHON_REQUIRED_USE} )
usb? ( threads )
"
# upstream includes an interactive test which is a nono for gentoo
RESTRICT="test"
S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
)
pkg_setup() {
enewgroup lp
enewuser lp -1 -1 -1 lp
enewgroup lpadmin 106
use python && python-single-r1_pkg_setup
if use kernel_linux; then
linux-info_pkg_setup
if ! linux_config_exists; then
ewarn "Can't check the linux kernel configuration."
ewarn "You might have some incompatible options enabled."
else
# recheck that we don't have usblp to collide with libusb
if use usb; then
if linux_chkconfig_present USB_PRINTER; then
eerror "Your usb printers will be managed via libusb. In this case, "
eerror "${P} requires the USB_PRINTER support disabled."
eerror "Please disable it:"
eerror " CONFIG_USB_PRINTER=n"
eerror "in /usr/src/linux/.config or"
eerror " Device Drivers --->"
eerror " USB support --->"
eerror " [ ] USB Printer support"
eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
fi
else
#here we should warn user that he should enable it so he can print
if ! linux_chkconfig_present USB_PRINTER; then
ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
ewarn "support in your kernel."
ewarn "Please enable it:"
ewarn " CONFIG_USB_PRINTER=y"
ewarn "in /usr/src/linux/.config or"
ewarn " Device Drivers --->"
ewarn " USB support --->"
ewarn " [*] USB Printer support"
ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
fi
fi
fi
fi
}
src_prepare() {
base_src_prepare
use systemd && epatch "${FILESDIR}/${PN}-1.7.2-systemd-socket-2.patch"
# Fix install-sh, posix sh does not have 'function'.
sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
AT_M4DIR=config-scripts eaclocal
eautoconf
# custom Makefiles
multilib_copy_sources
}
multilib_src_configure() {
export DSOFLAGS="${LDFLAGS}"
einfo LANGS=\"${LANGS}\"
einfo LINGUAS=\"${LINGUAS}\"
local myconf=()
if use ssl ; then
myconf+=(
$(use_enable gnutls)
$(use_enable !gnutls openssl)
)
else
myconf+=(
--disable-gnutls
--disable-openssl
)
fi
if tc-is-static-only; then
myconf+=(
--disable-shared
)
fi
if use systemd; then
myconf+=(
--with-systemdsystemunitdir="$(systemd_get_unitdir)"
)
fi
econf \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
--localstatedir="${EPREFIX}"/var \
--with-rundir="${EPREFIX}"/run/cups \
--with-cups-user=lp \
--with-cups-group=lp \
--with-docdir="${EPREFIX}"/usr/share/cups/html \
--with-languages="${LINGUAS}" \
--with-system-groups=lpadmin \
$(multilib_native_use_enable acl) \
$(use_enable zeroconf avahi) \
$(use_enable dbus) \
$(use_enable debug) \
$(use_enable debug debug-guards) \
$(multilib_native_use_enable kerberos gssapi) \
$(multilib_native_use_enable pam) \
$(use_enable static-libs static) \
$(use_enable threads) \
$(multilib_native_use_enable usb libusb) \
--disable-dnssd \
$(multilib_native_use_with java) \
--without-perl \
--without-php \
$(multilib_native_use_with python python "${PYTHON}") \
$(multilib_native_use_with xinetd xinetd /etc/xinetd.d) \
$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
"${myconf[@]}"
# install in /usr/libexec always, instead of using /usr/lib/cups, as that
# makes more sense when facing multilib support.
sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
}
multilib_src_compile() {
if multilib_is_native_abi; then
default
else
emake libs
fi
}
multilib_src_test() {
multilib_is_native_abi && default
}
multilib_src_install() {
if multilib_is_native_abi; then
emake BUILDROOT="${D}" install
else
emake BUILDROOT="${D}" install-libs install-headers
fi
}
multilib_src_install_all() {
dodoc {CHANGES,CREDITS,README}.txt
# move the default config file to docs
dodoc "${ED}"/etc/cups/cupsd.conf.default
rm -f "${ED}"/etc/cups/cupsd.conf.default
# clean out cups init scripts
rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
# install our init script
local neededservices
use zeroconf && neededservices+=" avahi-daemon"
use dbus && neededservices+=" dbus"
[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die
sed -i \
-e "s/@neededservices@/$neededservices/" \
"${T}"/cupsd || die
doinitd "${T}"/cupsd
# install our pam script
pamd_mimic_system cups auth account
if use xinetd ; then
# correct path
sed -i \
-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
"${ED}"/etc/xinetd.d/cups-lpd || die
# it is safer to disable this by default, bug #137130
grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
# write permission for file owner (root), bug #296221
fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
else
rm -rf "${ED}"/etc/xinetd.d
fi
keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
/var/log/cups /var/spool/cups/tmp
keepdir /etc/cups/{interfaces,ppd,ssl}
use X || rm -r "${ED}"/usr/share/applications
# create /etc/cups/client.conf, bug #196967 and #266678
echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
# the following files are now provided by cups-filters:
rm -r "${ED}"/usr/share/cups/banners || die
rm -r "${ED}"/usr/share/cups/data/testprint || die
# the following are created by the init script
rm -r "${ED}"/var/cache/cups || die
rm -r "${ED}"/run || die
# for the special case of running lprng and cups together, bug 467226
if use lprng-compat ; then
rm -fv "${ED}"/usr/bin/{lp*,cancel}
rm -fv "${ED}"/usr/sbin/lp*
rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
rm -fv "${ED}"/usr/share/man/man8/lp*
ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
ewarn "Unless you plan to install an exotic server setup, you most likely"
ewarn "do not want this. Disable the useflag then and all will be fine."
fi
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
# Update desktop file database and gtk icon cache (bug 370059)
gnome2_icon_cache_update
fdo-mime_desktop_database_update
# not slotted - at most one value
if ! [[ "${REPLACING_VERSIONS}" ]]; then
echo
elog "For information about installing a printer and general cups setup"
elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
echo
fi
if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
echo
elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
elog "You will have to find printers using zeroconf/avahi instead, enter"
elog "the location manually, or run cups-browsed from net-print/cups-filters"
elog "which re-adds that functionality as a separate daemon."
echo
fi
if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
ewarn
ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
ewarn
fi
}
pkg_postrm() {
# Update desktop file database and gtk icon cache (bug 370059)
gnome2_icon_cache_update
fdo-mime_desktop_database_update
}
1.1 net-print/cups/cups-1.7.1-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild?rev=1.1&content-type=text/plain
Index: cups-1.7.1-r2.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild,v 1.1 2014/05/14 08:47:24 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
multilib multilib-minimal pam python-single-r1 user versionator \
java-pkg-opt-2 systemd toolchain-funcs
MY_P=${P/_rc/rc}
MY_P=${MY_P/_beta/b}
MY_PV=${PV/_rc/rc}
MY_PV=${MY_PV/_beta/b}
if [[ ${PV} == *9999 ]]; then
inherit git-2
EGIT_REPO_URI="http://www.cups.org/cups.git"
if [[ ${PV} != 9999 ]]; then
EGIT_BRANCH=branch-${PV/.9999}
fi
KEYWORDS="~alpha ~arm ~hppa ~ia64 ~ppc ~ppc64"
else
SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
fi
DESCRIPTION="The Common Unix Printing System"
HOMEPAGE="http://www.cups.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="acl dbus debug gnutls java kerberos lprng-compat pam
python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
LANGS="ca es fr it ja ru"
for X in ${LANGS} ; do
IUSE="${IUSE} +linguas_${X}"
done
RDEPEND="
app-text/libpaper
acl? (
kernel_linux? (
sys-apps/acl
sys-apps/attr
)
)
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
java? ( >=virtual/jre-1.6 )
kerberos? ( virtual/krb5 )
!lprng-compat? ( !net-print/lprng )
pam? ( virtual/pam )
python? ( ${PYTHON_DEPS} )
selinux? ( sec-policy/selinux-cups )
ssl? (
gnutls? (
dev-libs/libgcrypt:0[${MULTILIB_USEDEP}]
net-libs/gnutls[${MULTILIB_USEDEP}]
)
!gnutls? ( >=dev-libs/openssl-0.9.8g[${MULTILIB_USEDEP}] )
)
usb? ( virtual/libusb:1 )
X? ( x11-misc/xdg-utils )
xinetd? ( sys-apps/xinetd )
zeroconf? ( net-dns/avahi[${MULTILIB_USEDEP}] )
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20140508
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)
"
DEPEND="${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
"
PDEPEND="
app-text/ghostscript-gpl[cups]
app-text/poppler[utils]
>=net-print/cups-filters-1.0.43
"
REQUIRED_USE="
gnutls? ( ssl )
python? ( ${PYTHON_REQUIRED_USE} )
usb? ( threads )
"
# upstream includes an interactive test which is a nono for gentoo
RESTRICT="test"
S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
"${FILESDIR}/${PN}-1.7.1-str4356.patch"
)
pkg_setup() {
enewgroup lp
enewuser lp -1 -1 -1 lp
enewgroup lpadmin 106
use python && python-single-r1_pkg_setup
if use kernel_linux; then
linux-info_pkg_setup
if ! linux_config_exists; then
ewarn "Can't check the linux kernel configuration."
ewarn "You might have some incompatible options enabled."
else
# recheck that we don't have usblp to collide with libusb
if use usb; then
if linux_chkconfig_present USB_PRINTER; then
eerror "Your usb printers will be managed via libusb. In this case, "
eerror "${P} requires the USB_PRINTER support disabled."
eerror "Please disable it:"
eerror " CONFIG_USB_PRINTER=n"
eerror "in /usr/src/linux/.config or"
eerror " Device Drivers --->"
eerror " USB support --->"
eerror " [ ] USB Printer support"
eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
fi
else
#here we should warn user that he should enable it so he can print
if ! linux_chkconfig_present USB_PRINTER; then
ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
ewarn "support in your kernel."
ewarn "Please enable it:"
ewarn " CONFIG_USB_PRINTER=y"
ewarn "in /usr/src/linux/.config or"
ewarn " Device Drivers --->"
ewarn " USB support --->"
ewarn " [*] USB Printer support"
ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
fi
fi
fi
fi
}
src_prepare() {
base_src_prepare
use systemd && epatch "${FILESDIR}/${PN}-1.5.0-systemd-socket-2.patch"
# Fix install-sh, posix sh does not have 'function'.
sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
AT_M4DIR=config-scripts eaclocal
eautoconf
# custom Makefiles
multilib_copy_sources
}
multilib_src_configure() {
export DSOFLAGS="${LDFLAGS}"
einfo LANGS=\"${LANGS}\"
einfo LINGUAS=\"${LINGUAS}\"
local myconf=()
if use ssl ; then
myconf+=(
$(use_enable gnutls)
$(use_enable !gnutls openssl)
)
else
myconf+=(
--disable-gnutls
--disable-openssl
)
fi
if tc-is-static-only; then
myconf+=(
--disable-shared
)
fi
if use systemd; then
myconf+=(
--with-systemdsystemunitdir="$(systemd_get_unitdir)"
)
fi
econf \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
--localstatedir="${EPREFIX}"/var \
--with-rundir="${EPREFIX}"/run/cups \
--with-cups-user=lp \
--with-cups-group=lp \
--with-docdir="${EPREFIX}"/usr/share/cups/html \
--with-languages="${LINGUAS}" \
--with-system-groups=lpadmin \
$(multilib_native_use_enable acl) \
$(use_enable zeroconf avahi) \
$(use_enable dbus) \
$(use_enable debug) \
$(use_enable debug debug-guards) \
$(multilib_native_use_enable kerberos gssapi) \
$(multilib_native_use_enable pam) \
$(use_enable static-libs static) \
$(use_enable threads) \
$(multilib_native_use_enable usb libusb) \
--disable-dnssd \
$(multilib_native_use_with java) \
--without-perl \
--without-php \
$(multilib_native_use_with python python "${PYTHON}") \
$(multilib_native_use_with xinetd xinetd /etc/xinetd.d) \
$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
"${myconf[@]}"
# install in /usr/libexec always, instead of using /usr/lib/cups, as that
# makes more sense when facing multilib support.
sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
}
multilib_src_compile() {
if multilib_is_native_abi; then
default
else
emake libs
fi
}
multilib_src_test() {
multilib_is_native_abi && default
}
multilib_src_install() {
if multilib_is_native_abi; then
emake BUILDROOT="${D}" install
else
emake BUILDROOT="${D}" install-libs install-headers
fi
}
multilib_src_install_all() {
dodoc {CHANGES,CREDITS,README}.txt
# move the default config file to docs
dodoc "${ED}"/etc/cups/cupsd.conf.default
rm -f "${ED}"/etc/cups/cupsd.conf.default
# clean out cups init scripts
rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
# install our init script
local neededservices
use zeroconf && neededservices+=" avahi-daemon"
use dbus && neededservices+=" dbus"
[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die
sed -i \
-e "s/@neededservices@/$neededservices/" \
"${T}"/cupsd || die
doinitd "${T}"/cupsd
# install our pam script
pamd_mimic_system cups auth account
if use xinetd ; then
# correct path
sed -i \
-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
"${ED}"/etc/xinetd.d/cups-lpd || die
# it is safer to disable this by default, bug #137130
grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
# write permission for file owner (root), bug #296221
fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
else
rm -rf "${ED}"/etc/xinetd.d
fi
keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
/var/log/cups /var/spool/cups/tmp
keepdir /etc/cups/{interfaces,ppd,ssl}
use X || rm -r "${ED}"/usr/share/applications
# create /etc/cups/client.conf, bug #196967 and #266678
echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
# the following files are now provided by cups-filters:
rm -r "${ED}"/usr/share/cups/banners || die
rm -r "${ED}"/usr/share/cups/data/testprint || die
# the following are created by the init script
rm -r "${ED}"/var/cache/cups || die
rm -r "${ED}"/run || die
# for the special case of running lprng and cups together, bug 467226
if use lprng-compat ; then
rm -fv "${ED}"/usr/bin/{lp*,cancel}
rm -fv "${ED}"/usr/sbin/lp*
rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
rm -fv "${ED}"/usr/share/man/man8/lp*
ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
ewarn "Unless you plan to install an exotic server setup, you most likely"
ewarn "do not want this. Disable the useflag then and all will be fine."
fi
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
# Update desktop file database and gtk icon cache (bug 370059)
gnome2_icon_cache_update
fdo-mime_desktop_database_update
# not slotted - at most one value
if ! [[ "${REPLACING_VERSIONS}" ]]; then
echo
elog "For information about installing a printer and general cups setup"
elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
echo
fi
if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
echo
elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
elog "You will have to find printers using zeroconf/avahi instead, enter"
elog "the location manually, or run cups-browsed from net-print/cups-filters"
elog "which re-adds that functionality as a separate daemon."
echo
fi
if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
ewarn
ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
ewarn
fi
}
pkg_postrm() {
# Update desktop file database and gtk icon cache (bug 370059)
gnome2_icon_cache_update
fdo-mime_desktop_database_update
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-print/cups: cups-1.7.2-r1.ebuild cups-1.7.1-r2.ebuild cups-9999.ebuild ChangeLog
@ 2014-05-30 21:26 Michal Gorny (mgorny)
0 siblings, 0 replies; 3+ messages in thread
From: Michal Gorny (mgorny) @ 2014-05-30 21:26 UTC (permalink / raw
To: gentoo-commits
mgorny 14/05/30 21:26:30
Modified: cups-1.7.2-r1.ebuild cups-1.7.1-r2.ebuild
cups-9999.ebuild ChangeLog
Log:
Enable multilib krb5 support.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.2 net-print/cups/cups-1.7.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild?r1=1.1&r2=1.2
Index: cups-1.7.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-1.7.2-r1.ebuild 14 May 2014 08:47:24 -0000 1.1
+++ cups-1.7.2-r1.ebuild 30 May 2014 21:26:30 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild,v 1.1 2014/05/14 08:47:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild,v 1.2 2014/05/30 21:26:30 mgorny Exp $
EAPI=5
@@ -51,7 +51,7 @@
)
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
java? ( >=virtual/jre-1.6 )
- kerberos? ( virtual/krb5 )
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
!lprng-compat? ( !net-print/lprng )
pam? ( virtual/pam )
python? ( ${PYTHON_DEPS} )
@@ -189,7 +189,10 @@
)
fi
+ # need to override KRB5CONFIG for proper flags
+ # https://www.cups.org/str.php?L4423
econf \
+ KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
--localstatedir="${EPREFIX}"/var \
--with-rundir="${EPREFIX}"/run/cups \
@@ -203,7 +206,7 @@
$(use_enable dbus) \
$(use_enable debug) \
$(use_enable debug debug-guards) \
- $(multilib_native_use_enable kerberos gssapi) \
+ $(use_enable kerberos gssapi) \
$(multilib_native_use_enable pam) \
$(use_enable static-libs static) \
$(use_enable threads) \
1.2 net-print/cups/cups-1.7.1-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild?r1=1.1&r2=1.2
Index: cups-1.7.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-1.7.1-r2.ebuild 14 May 2014 08:47:24 -0000 1.1
+++ cups-1.7.1-r2.ebuild 30 May 2014 21:26:30 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild,v 1.1 2014/05/14 08:47:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild,v 1.2 2014/05/30 21:26:30 mgorny Exp $
EAPI=5
@@ -50,7 +50,7 @@
)
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
java? ( >=virtual/jre-1.6 )
- kerberos? ( virtual/krb5 )
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
!lprng-compat? ( !net-print/lprng )
pam? ( virtual/pam )
python? ( ${PYTHON_DEPS} )
@@ -189,7 +189,10 @@
)
fi
+ # need to override KRB5CONFIG for proper flags
+ # https://www.cups.org/str.php?L4423
econf \
+ KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
--localstatedir="${EPREFIX}"/var \
--with-rundir="${EPREFIX}"/run/cups \
@@ -203,7 +206,7 @@
$(use_enable dbus) \
$(use_enable debug) \
$(use_enable debug debug-guards) \
- $(multilib_native_use_enable kerberos gssapi) \
+ $(use_enable kerberos gssapi) \
$(multilib_native_use_enable pam) \
$(use_enable static-libs static) \
$(use_enable threads) \
1.56 net-print/cups/cups-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?r1=1.55&r2=1.56
Index: cups-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- cups-9999.ebuild 14 May 2014 08:47:24 -0000 1.55
+++ cups-9999.ebuild 30 May 2014 21:26:30 -0000 1.56
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.55 2014/05/14 08:47:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.56 2014/05/30 21:26:30 mgorny Exp $
EAPI=5
@@ -50,7 +50,7 @@
)
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
java? ( >=virtual/jre-1.6 )
- kerberos? ( virtual/krb5 )
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
!lprng-compat? ( !net-print/lprng )
pam? ( virtual/pam )
python? ( ${PYTHON_DEPS} )
@@ -188,7 +188,10 @@
)
fi
+ # need to override KRB5CONFIG for proper flags
+ # https://www.cups.org/str.php?L4423
econf \
+ KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
--localstatedir="${EPREFIX}"/var \
--with-rundir="${EPREFIX}"/run/cups \
@@ -202,7 +205,7 @@
$(use_enable dbus) \
$(use_enable debug) \
$(use_enable debug debug-guards) \
- $(multilib_native_use_enable kerberos gssapi) \
+ $(use_enable kerberos gssapi) \
$(multilib_native_use_enable pam) \
$(use_enable static-libs static) \
$(use_enable threads) \
1.613 net-print/cups/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.613&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.613&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.612&r2=1.613
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
retrieving revision 1.612
retrieving revision 1.613
diff -u -r1.612 -r1.613
--- ChangeLog 14 May 2014 17:46:09 -0000 1.612
+++ ChangeLog 30 May 2014 21:26:30 -0000 1.613
@@ -1,6 +1,10 @@
# ChangeLog for net-print/cups
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.612 2014/05/14 17:46:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.613 2014/05/30 21:26:30 mgorny Exp $
+
+ 30 May 2014; Michał Górny <mgorny@gentoo.org> cups-1.7.1-r2.ebuild,
+ cups-1.7.2-r1.ebuild, cups-9999.ebuild:
+ Enable multilib krb5 support.
14 May 2014; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.7.1.ebuild:
Remove old
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-print/cups: cups-1.7.2-r1.ebuild cups-1.7.1-r2.ebuild cups-9999.ebuild ChangeLog
@ 2014-06-02 15:03 Michal Gorny (mgorny)
0 siblings, 0 replies; 3+ messages in thread
From: Michal Gorny (mgorny) @ 2014-06-02 15:03 UTC (permalink / raw
To: gentoo-commits
mgorny 14/06/02 15:03:36
Modified: cups-1.7.2-r1.ebuild cups-1.7.1-r2.ebuild
cups-9999.ebuild ChangeLog
Log:
Install cups-config for all ABIs, and add it to MULTILIB_CHOST_TOOLS.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.3 net-print/cups/cups-1.7.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild?r1=1.2&r2=1.3
Index: cups-1.7.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-1.7.2-r1.ebuild 30 May 2014 21:26:30 -0000 1.2
+++ cups-1.7.2-r1.ebuild 2 Jun 2014 15:03:36 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild,v 1.2 2014/05/30 21:26:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild,v 1.3 2014/06/02 15:03:36 mgorny Exp $
EAPI=5
@@ -100,6 +100,10 @@
"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
)
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/cups-config
+)
+
pkg_setup() {
enewgroup lp
enewuser lp -1 -1 -1 lp
@@ -244,6 +248,7 @@
emake BUILDROOT="${D}" install
else
emake BUILDROOT="${D}" install-libs install-headers
+ dobin cups-config
fi
}
1.3 net-print/cups/cups-1.7.1-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild?r1=1.2&r2=1.3
Index: cups-1.7.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-1.7.1-r2.ebuild 30 May 2014 21:26:30 -0000 1.2
+++ cups-1.7.1-r2.ebuild 2 Jun 2014 15:03:36 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild,v 1.2 2014/05/30 21:26:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild,v 1.3 2014/06/02 15:03:36 mgorny Exp $
EAPI=5
@@ -100,6 +100,10 @@
"${FILESDIR}/${PN}-1.7.1-str4356.patch"
)
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/cups-config
+)
+
pkg_setup() {
enewgroup lp
enewuser lp -1 -1 -1 lp
@@ -244,6 +248,7 @@
emake BUILDROOT="${D}" install
else
emake BUILDROOT="${D}" install-libs install-headers
+ dobin cups-config
fi
}
1.57 net-print/cups/cups-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?r1=1.56&r2=1.57
Index: cups-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- cups-9999.ebuild 30 May 2014 21:26:30 -0000 1.56
+++ cups-9999.ebuild 2 Jun 2014 15:03:36 -0000 1.57
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.56 2014/05/30 21:26:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.57 2014/06/02 15:03:36 mgorny Exp $
EAPI=5
@@ -99,6 +99,10 @@
"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
)
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/cups-config
+)
+
pkg_setup() {
enewgroup lp
enewuser lp -1 -1 -1 lp
@@ -243,6 +247,7 @@
emake BUILDROOT="${D}" install
else
emake BUILDROOT="${D}" install-libs install-headers
+ dobin cups-config
fi
}
1.614 net-print/cups/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.614&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.614&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.613&r2=1.614
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
retrieving revision 1.613
retrieving revision 1.614
diff -u -r1.613 -r1.614
--- ChangeLog 30 May 2014 21:26:30 -0000 1.613
+++ ChangeLog 2 Jun 2014 15:03:36 -0000 1.614
@@ -1,6 +1,10 @@
# ChangeLog for net-print/cups
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.613 2014/05/30 21:26:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.614 2014/06/02 15:03:36 mgorny Exp $
+
+ 02 Jun 2014; Michał Górny <mgorny@gentoo.org> cups-1.7.1-r2.ebuild,
+ cups-1.7.2-r1.ebuild, cups-9999.ebuild:
+ Install cups-config for all ABIs, and add it to MULTILIB_CHOST_TOOLS.
30 May 2014; Michał Górny <mgorny@gentoo.org> cups-1.7.1-r2.ebuild,
cups-1.7.2-r1.ebuild, cups-9999.ebuild:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-02 15:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-02 15:03 [gentoo-commits] gentoo-x86 commit in net-print/cups: cups-1.7.2-r1.ebuild cups-1.7.1-r2.ebuild cups-9999.ebuild ChangeLog Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2014-05-30 21:26 Michal Gorny (mgorny)
2014-05-14 8:47 Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox