* [gentoo-commits] gentoo-x86 commit in net-print/cups: ChangeLog cups-1.4.4-r1.ebuild
@ 2010-08-13 8:42 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-08-13 8:42 UTC (permalink / raw
To: gentoo-commits
scarabeus 10/08/13 08:42:59
Modified: ChangeLog
Added: cups-1.4.4-r1.ebuild
Log:
Revbump with various patches i collected around.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.395 net-print/cups/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.395&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.395&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.394&r2=1.395
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- ChangeLog 10 Aug 2010 20:54:31 -0000 1.394
+++ ChangeLog 13 Aug 2010 08:42:58 -0000 1.395
@@ -1,6 +1,12 @@
# ChangeLog for net-print/cups
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.394 2010/08/10 20:54:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.395 2010/08/13 08:42:58 scarabeus Exp $
+
+*cups-1.4.4-r1 (13 Aug 2010)
+
+ 13 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ +cups-1.4.4-r1.ebuild:
+ Revbump with various patches i collected around.
10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
cups-1.3.11-r1.ebuild, cups-1.3.11-r2.ebuild:
1.1 net-print/cups/cups-1.4.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.4-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.4-r1.ebuild?rev=1.1&content-type=text/plain
Index: cups-1.4.4-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.4-r1.ebuild,v 1.1 2010/08/13 08:42:59 scarabeus Exp $
EAPI=3
PYTHON_DEPEND="python? 2:2.5"
RESTRICT_PYTHON_ABIS="3.*"
MY_P=${P/_}
PATCH_VERSION=01
SRC_PATCHES="http://gentoo.ccss.cz/${P}-gentoopatches-${PATCH_VERSION}.tar.bz2"
inherit autotools eutils flag-o-matic multilib pam perl-module python versionator java-pkg-opt-2
DESCRIPTION="The Common Unix Printing System"
HOMEPAGE="http://www.cups.org/"
SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2
${SRC_PATCHES}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE="X acl avahi dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static +threads +tiff +usb xinetd zeroconf"
LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
for X in ${LANGS} ; do
IUSE="${IUSE} linguas_${X}"
done
RDEPEND="
app-text/libpaper
dev-libs/libgcrypt
X? ( x11-misc/xdg-utils )
acl? (
kernel_linux? (
sys-apps/acl
sys-apps/attr
)
)
avahi? ( net-dns/avahi[mdnsresponder-compat] )
dbus? ( sys-apps/dbus )
java? ( >=virtual/jre-1.6 )
jpeg? ( virtual/jpeg:0 )
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap[ssl?,gnutls?] )
pam? ( virtual/pam )
perl? ( dev-lang/perl )
php? ( dev-lang/php )
png? ( >=media-libs/libpng-1.4.3 )
slp? ( >=net-libs/openslp-1.0.4 )
ssl? (
gnutls? ( net-libs/gnutls )
!gnutls? ( >=dev-libs/openssl-0.9.8g )
)
tiff? ( >=media-libs/tiff-3.5.5 )
usb? ( virtual/libusb:0 )
xinetd? ( sys-apps/xinetd )
zeroconf? (
!avahi? ( net-misc/mDNSResponder )
)
"
DEPEND="${RDEPEND}
dev-util/pkgconfig
java? ( >=virtual/jdk-1.6 )
"
PDEPEND="
app-text/ghostscript-gpl[cups]
>=app-text/poppler-0.12.3-r3[utils]
"
# upstream includes an interactive test which is a nono for gentoo.
RESTRICT="test"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
enewgroup lp
enewuser lp -1 -1 -1 lp
enewgroup lpadmin 106
# python 3 is no-go
python_set_active_version 2
python_pkg_setup
}
src_prepare() {
if [[ -n ${SRC_PATCHES} ]]; then
EPATCH_FORCE="yes" \
EPATCH_SOURCE="${WORKDIR}/patches" \
EPATCH_SUFFIX="patch" \
epatch
fi
AT_M4DIR=config-scripts eaclocal
eautoconf
}
src_configure() {
export DSOFLAGS="${LDFLAGS}"
# locale support
strip-linguas ${LANGS}
if [ -z "${LINGUAS}" ] ; then
export LINGUAS=none
fi
local myconf
if use ssl || use gnutls ; then
myconf+="
$(use_enable gnutls)
$(use_enable !gnutls openssl)
"
else
myconf+="
--disable-gnutls
--disable-openssl
"
fi
econf \
--libdir=/usr/$(get_libdir) \
--localstatedir=/var \
--with-cups-user=lp \
--with-cups-group=lp \
--with-docdir=/usr/share/cups/html \
--with-languages="${LINGUAS}" \
--with-pdftops=/usr/bin/pdftops \
--with-system-groups=lpadmin \
$(use_enable acl) \
$(use_enable avahi) \
$(use_enable dbus) \
$(use_enable debug) \
$(use_enable debug debug-guards) \
$(use_enable jpeg) \
$(use_enable kerberos gssapi) \
$(use_enable ldap) \
$(use_enable pam) \
$(use_enable png) \
$(use_enable slp) \
$(use_enable static) \
$(use_enable threads) \
$(use_enable tiff) \
$(use_enable usb libusb) \
$(use_enable zeroconf dnssd) \
$(use_with java) \
$(use_with perl) \
$(use_with php) \
$(use_with python) \
$(use_with xinetd xinetd /etc/xinetd.d) \
--enable-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)"/usr/libexec/cups:' Makedefs || die
sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
}
src_compile() {
emake || die "emake failed"
# perl
if use perl; then
cd "${S}"/scripting/perl
perl-module_src_prep
perl-module_src_compile
fi
# php
if use php; then
cd "${S}"/scripting/php
emake || die "emake php failed"
fi
}
src_install() {
emake BUILDROOT="${D}" install || die "emake install failed"
dodoc {CHANGES,CREDITS,README}.txt || die "dodoc install failed"
# perl
if use perl; then
cd "${S}"/scripting/perl
perl-module_src_install
fixlocalpod
fi
# php
if use php; then
cd "${S}"/scripting/php
emake DESTDIR="${D}" install || die "emake install for php bindings failed"
fi
# clean out cups init scripts
rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
# install our init script
local neededservices
use avahi && neededservices+=" avahi-daemon"
use dbus && neededservices+=" dbus"
use zeroconf && ! use avahi && neededservices+=" mDNSResponderPosix"
[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
sed -i \
-e "s/@neededservices@/$neededservices/" \
"${T}"/cupsd || die
doinitd "${T}"/cupsd || die "doinitd failed"
# 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:" \
"${D}"/etc/xinetd.d/cups-lpd || die
# it is safer to disable this by default, bug #137130
grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \
{ sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd || die ; }
else
rm -rf "${D}"/etc/xinetd.d
fi
keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
/var/cache/cups /var/cache/cups/rss /var/log/cups /var/run/cups/certs \
/var/spool/cups/tmp
keepdir /etc/cups/{interfaces,ppd,ssl}
use X || rm -r "${D}"/usr/share/applications
# create /etc/cups/client.conf, bug #196967 and #266678
echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
}
pkg_postinst() {
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
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-print/cups: ChangeLog cups-1.4.4-r1.ebuild
@ 2010-08-13 11:25 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-08-13 11:25 UTC (permalink / raw
To: gentoo-commits
scarabeus 10/08/13 11:25:41
Modified: ChangeLog
Removed: cups-1.4.4-r1.ebuild
Log:
Drop my version. I am not interested in maintaining cups fully and maintainer correctly pointed out he dont want to maintian such huge patchset.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.396 net-print/cups/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.396&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.396&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.395&r2=1.396
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- ChangeLog 13 Aug 2010 08:42:58 -0000 1.395
+++ ChangeLog 13 Aug 2010 11:25:41 -0000 1.396
@@ -1,6 +1,12 @@
# ChangeLog for net-print/cups
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.395 2010/08/13 08:42:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.396 2010/08/13 11:25:41 scarabeus Exp $
+
+ 13 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ -cups-1.4.4-r1.ebuild:
+ Drop my version. I am not interested in maintaining cups fully and
+ maintainer correctly pointed out he dont want to maintian such huge
+ patchset.
*cups-1.4.4-r1 (13 Aug 2010)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-print/cups: ChangeLog cups-1.4.4-r1.ebuild
@ 2010-09-10 23:39 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-09-10 23:39 UTC (permalink / raw
To: gentoo-commits
scarabeus 10/09/10 23:39:15
Modified: ChangeLog
Added: cups-1.4.4-r1.ebuild
Log:
Revision bump again. This time with mimimalistic patches only altering build. Feel free to rework them.
(Portage version: 2.2_rc78/cvs/Linux x86_64)
Revision Changes Path
1.397 net-print/cups/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.397&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.397&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.396&r2=1.397
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- ChangeLog 13 Aug 2010 11:25:41 -0000 1.396
+++ ChangeLog 10 Sep 2010 23:39:15 -0000 1.397
@@ -1,6 +1,10 @@
# ChangeLog for net-print/cups
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.396 2010/08/13 11:25:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.397 2010/09/10 23:39:15 scarabeus Exp $
+
+ 10 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> cups-1.4.4-r1.ebuild:
+ Revision bump again. This time with mimimalistic patches only altering
+ build. Feel free to rework them.
13 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-cups-1.4.4-r1.ebuild:
1.3 net-print/cups/cups-1.4.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.4-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.4-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.4-r1.ebuild?r1=1.2&r2=1.3
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-09-10 23:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-13 11:25 [gentoo-commits] gentoo-x86 commit in net-print/cups: ChangeLog cups-1.4.4-r1.ebuild Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2010-09-10 23:39 Tomas Chvatal (scarabeus)
2010-08-13 8:42 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox