summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2007-07-13 10:08:20 +0000
committerStefan Schweizer <genstef@gentoo.org>2007-07-13 10:08:20 +0000
commit941a32108c6ecdcd62b23113de53fca6da48c7a1 (patch)
tree223750b0e5dfe1ab35463959142964cbc3196e48 /net-print
parentMarked ppc and ppc64 stable for bug #185155. (diff)
downloadhistorical-941a32108c6ecdcd62b23113de53fca6da48c7a1.tar.gz
historical-941a32108c6ecdcd62b23113de53fca6da48c7a1.tar.bz2
historical-941a32108c6ecdcd62b23113de53fca6da48c7a1.zip
version bump
Package-Manager: portage-2.1.3_rc7
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups/ChangeLog7
-rw-r--r--net-print/cups/Manifest26
-rw-r--r--net-print/cups/cups-1.2.12.ebuild220
-rw-r--r--net-print/cups/files/digest-cups-1.2.123
4 files changed, 241 insertions, 15 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 0152e1d36c21..ccdba31770b9 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-print/cups
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.243 2007/06/11 21:42:30 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.244 2007/07/13 10:08:20 genstef Exp $
+
+*cups-1.2.12 (13 Jul 2007)
+
+ 13 Jul 2007; Stefan Schweizer <genstef@gentoo.org> +cups-1.2.12.ebuild:
+ version bump
11 Jun 2007; Daniel Gryniewicz <dang@gentoo.org> cups-1.2.10-r1.ebuild:
Marked stable on amd64 for bug #180909
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 8016fb8d95a9..ab4bac5db02c 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX cups-1.1.23-bindnow.patch 2087 RMD160 35c18c1bbeb7c79f9207ecbd69c004f2ddf68f80 SHA1 6f3c24500c50016c0bb2f1913b7c3cb6384c6b21 SHA256 fb932b7e9d04dfe7d52bd455f3514818a3bba1eaa3a3342b5c6b840bf957e67b
MD5 b22c12cb42113ddc40988cfbe93e3519 files/cups-1.1.23-bindnow.patch 2087
RMD160 35c18c1bbeb7c79f9207ecbd69c004f2ddf68f80 files/cups-1.1.23-bindnow.patch 2087
@@ -56,6 +53,7 @@ SHA256 60fc863f11c5b114b5bfd8bbba905abca5526c92581f7a5b5570e8723a4aeebc files/pd
DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e
DIST cups-1.2.10-source.tar.bz2 3618084 RMD160 85b3bbd46a6fc097891c571ffad8e5e46693743f SHA1 241d7a3c52370fb08ed2ffc3fd8f59673d158299 SHA256 601b3b9256c55361477427c3e8db56c9ee4e141762814aea590bcf110a95bb36
DIST cups-1.2.11-source.tar.bz2 3774113 RMD160 c5471c205a6ebb7ba0c2067b89769282e1a044a1 SHA1 4635dc423e3fc061df10d6af5ba60aaceb03d34b SHA256 c313e34a79af84e92609428d31ab292c04a4db69596ad9b264dd0ea719e2ecb0
+DIST cups-1.2.12-source.tar.bz2 3788301 RMD160 598270e37ff8a9b9ff1e667066d6f7e120493e32 SHA1 11a540f76a1d3164b6636bf8ba47928803ad9356 SHA256 b4ff8e934da7db32d5654360ea9068faa0ed5a00fde02161ae53c2052510d00f
DIST cups-1.2.6-source.tar.bz2 3566806 RMD160 a239738f711168cb82c11ee20a7aa92b070e5811 SHA1 1e12d2db23c6a46ae8960b9b765be0f1b829bbac SHA256 cdad0e2e461121257e740b8cb1111c7266cea434dd532a8bcc69c69adffe8aa8
DIST cups-1.2.9-source.tar.bz2 3617594 RMD160 8af1323a8006c3736a15c25c89773292a129161d SHA1 58e67800103e699b4699f17db41da33ddea360fb SHA256 9764a76adf41d72ad4142df8f8a0117507092623a58212a463dfb8a2dced7f09
EBUILD cups-1.1.23-r8.ebuild 5009 RMD160 b1cb7d5c2ede0fb359c96168f53a1518ad459736 SHA1 2730b6d204679da7aa4e70a916432e93cee48411 SHA256 47a824972575230e3f2a19f5919a8dc09f43f0b3df8ab3a1213b91891b6f0d8b
@@ -74,6 +72,10 @@ EBUILD cups-1.2.11.ebuild 6803 RMD160 08f8a43dbb47d6085b23467337973346df8355bc S
MD5 4e891eb83a6bab4fa8ddad59700feb79 cups-1.2.11.ebuild 6803
RMD160 08f8a43dbb47d6085b23467337973346df8355bc cups-1.2.11.ebuild 6803
SHA256 0b4e201d219053360003c5e27c391b88c37c70b4af195932a4a246e44cb9c25f cups-1.2.11.ebuild 6803
+EBUILD cups-1.2.12.ebuild 6803 RMD160 063b099fc55ffa580253627c1bc7400c21c145db SHA1 e5cb7484faecb635766515495add231ccf62f6eb SHA256 a409ca07da01e8be6301ff745de88ad1b86f73bd87093628fa402547b9c6aa20
+MD5 f59aaabae171eac4c5eb923d4fb778ea cups-1.2.12.ebuild 6803
+RMD160 063b099fc55ffa580253627c1bc7400c21c145db cups-1.2.12.ebuild 6803
+SHA256 a409ca07da01e8be6301ff745de88ad1b86f73bd87093628fa402547b9c6aa20 cups-1.2.12.ebuild 6803
EBUILD cups-1.2.6.ebuild 5774 RMD160 c367d752f15c0cc79b8363f2d074d4e75ab0926e SHA1 f19af647349ed50db13baf1178f300d560c04e78 SHA256 4b0328c5a2563473491395cd7c29f40fa5e2aefa38ff8b5cb47e681af7555bdb
MD5 2600c86a8c14db0c09dbbebd56164b12 cups-1.2.6.ebuild 5774
RMD160 c367d752f15c0cc79b8363f2d074d4e75ab0926e cups-1.2.6.ebuild 5774
@@ -82,10 +84,10 @@ EBUILD cups-1.2.9.ebuild 6117 RMD160 55433b2b96631eb8be9223c0ba4c2bd14e9fb189 SH
MD5 266018349216b2a66a3a19cafa1bebe0 cups-1.2.9.ebuild 6117
RMD160 55433b2b96631eb8be9223c0ba4c2bd14e9fb189 cups-1.2.9.ebuild 6117
SHA256 dc0d9602eb489de0074fc03045f75ec0da59de95dc0815feb6c16b3e6d599cdc cups-1.2.9.ebuild 6117
-MISC ChangeLog 33801 RMD160 96dcb7f6055a451f3558bfa9bc5a2dd6a17dac3d SHA1 cbcfa394276305196a1b84feaab4f2d7134487f7 SHA256 f5e0eec6d24d5cf5b3495c7fe1d45f07c94e100c94d24b8bd9a3a30dbd149991
-MD5 9c062f1971c8ef06ffe08c436953bbf5 ChangeLog 33801
-RMD160 96dcb7f6055a451f3558bfa9bc5a2dd6a17dac3d ChangeLog 33801
-SHA256 f5e0eec6d24d5cf5b3495c7fe1d45f07c94e100c94d24b8bd9a3a30dbd149991 ChangeLog 33801
+MISC ChangeLog 33922 RMD160 94a361c96521b201cd7883b757c6d1cfb38c124c SHA1 f29450257e2539e2261dc409524c2166627087ce SHA256 2c88ed8e2bc92308a76bc11dc975dbaeec27f78ea07e5017f33b649454686823
+MD5 2a56cf76d715438c92646f3bafbd5efc ChangeLog 33922
+RMD160 94a361c96521b201cd7883b757c6d1cfb38c124c ChangeLog 33922
+SHA256 2c88ed8e2bc92308a76bc11dc975dbaeec27f78ea07e5017f33b649454686823 ChangeLog 33922
MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -102,16 +104,12 @@ SHA256 66f16eee78c2442511803e6de89563a1f32ff0150e604904a123b2b222f0e3b3 files/di
MD5 535f9beba5e86aa94267b23e40eb171d files/digest-cups-1.2.11 262
RMD160 9bc38d56c88a92eae21e53e54bd54b34b18cfc3e files/digest-cups-1.2.11 262
SHA256 16d43979bbc4d88e36a33bf34d6a3dacb94bf0c384f943cc68ec39136625689e files/digest-cups-1.2.11 262
+MD5 422be1a8808e7fb306fcc6872c874a9b files/digest-cups-1.2.12 262
+RMD160 af6b2363980a1e6323b89c87f8a25598b7730897 files/digest-cups-1.2.12 262
+SHA256 1ed8553b6b83c34074f536128d9794fdbd11070a6091353722bb0cc5d4e625df files/digest-cups-1.2.12 262
MD5 5b3f9aec328891f1e9bded2d2577bd98 files/digest-cups-1.2.6 259
RMD160 d5f75c2671a926c71c6698fc3100d9acb106fedd files/digest-cups-1.2.6 259
SHA256 3f7f97c3ff4a6096c1b2209892b447540a6dca6b1e53d03232340d5e74cdc60a files/digest-cups-1.2.6 259
MD5 176a666fe4ea35c61883dbca59ed67f2 files/digest-cups-1.2.9 259
RMD160 ee7512fccc424990869d0ca44442749f90eb0a7d files/digest-cups-1.2.9 259
SHA256 8757c4a8802841ca9ff72f5fc260d8fdddbd3970b321db43ac0416fd1b563ae1 files/digest-cups-1.2.9 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD4DBQFGbcHkomPajV0RnrERAh1rAJjyv8uIjegAo+eG9b3zgq/7Zm4nAJ0d/5Bw
-C5Hte0NapHEYwnYhzXTGfg==
-=N0lM
------END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.2.12.ebuild b/net-print/cups/cups-1.2.12.ebuild
new file mode 100644
index 000000000000..c8a6bf2107d8
--- /dev/null
+++ b/net-print/cups/cups-1.2.12.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12.ebuild,v 1.1 2007/07/13 10:08:20 genstef Exp $
+
+WANT_AUTOMAKE=latest
+
+inherit autotools eutils flag-o-matic multilib pam
+
+MY_P=${P/_}
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+SRC_URI="http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2"
+#ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ldap ssl slp pam php samba nls dbus tiff png ppds jpeg X"
+
+DEP="pam? ( virtual/pam )
+ ssl? ( net-libs/gnutls )
+ slp? ( >=net-libs/openslp-1.0.4 )
+ ldap? ( net-nds/openldap )
+ dbus? ( sys-apps/dbus )
+ png? ( >=media-libs/libpng-1.2.1 )
+ tiff? ( >=media-libs/tiff-3.5.5 )
+ jpeg? ( >=media-libs/jpeg-6b )
+ php? ( dev-lang/php )
+ app-text/libpaper"
+DEPEND="${DEP}
+ !<net-print/foomatic-filters-ppds-20070501
+ !<net-print/hplip-1.7.4a-r1
+ nls? ( sys-devel/gettext )"
+RDEPEND="${DEP}
+ nls? ( virtual/libintl )
+ !virtual/lpr
+ >=app-text/poppler-0.4.3-r1
+ X? ( x11-misc/xdg-utils )"
+
+PDEPEND="
+ ppds? ( || (
+ (
+ net-print/foomatic-filters-ppds
+ net-print/foomatic-db-ppds
+ )
+ net-print/foomatic-filters-ppds
+ net-print/foomatic-db-ppds
+ net-print/hplip
+ media-gfx/gimp-print
+ net-print/foo2zjs
+ net-print/cups-pdf
+ ) )
+ samba? ( >=net-fs/samba-3.0.8 )
+ virtual/ghostscript"
+PROVIDE="virtual/lpr"
+
+# upstream includes an interactive test which is a nono for gentoo.
+# therefore, since the printing herd has bigger fish to fry, for now,
+# we just leave it out, even if FEATURES=test
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ if use x86 && [ -d "/usr/lib64" ]
+ then
+ eerror "You are running an x86 system, but /usr/lib64 exists, cups will install all library objects into this directory!"
+ eerror "You should remove /usr/lib64, but before you do, you should check for existing objects, and re-compile all affected packages."
+ eerror "You can use qfile (emerge portage-utils to install qfile) to get a list of the affected ebuilds:"
+ eerror "# qfile -qC /usr/lib64"
+ die "lib64 on x86 detected"
+ fi
+
+ enewgroup lp
+ enewuser lp -1 -1 -1 lp
+
+ enewgroup lpadmin 106
+}
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ # upstream does not acknowledge bindnow as a solution
+ epatch ${FILESDIR}/cups-1.2.0-bindnow.patch
+
+ # cups does not use autotools "the usual way" and ship a static config.h.in
+ eaclocal
+ eautoconf
+}
+
+src_compile() {
+ export DSOFLAGS="${LDFLAGS}"
+ econf \
+ --with-cups-user=lp \
+ --with-cups-group=lp \
+ --with-system-groups=lpadmin \
+ --localstatedir=/var \
+ --with-docdir=/usr/share/cups/html \
+ --with-bindnow=$(bindnow-flags) \
+ $(use_enable pam) \
+ $(use_enable ssl) \
+ --enable-gnutls \
+ $(use_enable slp) \
+ $(use_enable nls) \
+ $(use_enable dbus) \
+ $(use_enable png) \
+ $(use_enable jpeg) \
+ $(use_enable tiff) \
+ $(use_with php) \
+ $(use_enable ldap) \
+ --enable-libpaper \
+ --enable-threads \
+ --enable-static \
+ --disable-pdftops \
+ || die "econf failed"
+
+ # 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
+ sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h
+ sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config
+
+ emake || die "emake failed"
+}
+
+src_install() {
+ emake BUILDROOT=${D} install || die "emake install failed"
+ dodoc {CHANGES{,-1.{0,1}},CREDITS,LICENSE,README}.txt
+
+ # clean out cups init scripts
+ rm -rf ${D}/etc/{init.d/cups,rc*,pam.d/cups}
+ # install our init scripts
+ newinitd ${FILESDIR}/cupsd.init cupsd
+ # install our pam script
+ pamd_mimic_system cups auth account
+
+ # correct path
+ sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" ${D}/etc/xinetd.d/cups-lpd
+ # 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
+
+ # install pdftops filter
+ exeinto /usr/libexec/cups/filter/
+ newexe ${FILESDIR}/pdftops.pl pdftops
+
+ # only for gs-esp this is correct, see bug 163897
+ if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu; then
+ sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" ${D}/etc/cups/mime.convs
+ fi
+
+ keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
+ /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl
+
+ # .desktop handling. X useflag. xdg-open from freedesktop is preferred
+ if use X; then
+ sed -i -e "s:htmlview:xdg-open:" ${D}/usr/share/applications/cups.desktop
+ else
+ rm -r ${D}/usr/share/applications
+ fi
+
+ # Fix a symlink collision, see bug #172341
+ dodir /usr/share/ppd
+ dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
+}
+
+pkg_preinst() {
+ # cleanups
+ [ -n "${PN}" ] && rm -fR ${ROOT}/usr/share/doc/${PN}-*
+}
+
+pkg_postinst() {
+ einfo "Remote printing: change "
+ einfo "Listen localhost:631"
+ einfo "to"
+ einfo "Listen *:631"
+ einfo "in /etc/cups/cupsd.conf"
+ einfo
+ einfo "For more information about installing a printer take a look at:"
+ einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
+
+ local good_gs=false
+ for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp; do
+ if has_version ${x} && built_with_use ${x} cups; then
+ good_gs=true
+ break
+ fi
+ done;
+ if ! ${good_gs}; then
+ ewarn
+ ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on"
+ fi
+ if has_version =net-print/cups-1.1*; then
+ ewarn
+ ewarn "The configuration changed with cups-1.2, you may want to save the old"
+ ewarn "one and start from scratch:"
+ ewarn "# mv /etc/cups /etc/cups.orig; emerge -va1 cups"
+ ewarn
+ ewarn "You need to rebuild kdelibs for kdeprinter to work with cups-1.2"
+ fi
+ if [ -e ${ROOT}/usr/lib/cups ]; then
+ ewarn
+ ewarn "/usr/lib/cups exists - You need to remerge every ebuild that"
+ ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
+ ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")"
+ ewarn
+ ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility"
+ ewarn "symlinks installed by this package, it wont be needed on later merges."
+ ewarn "You should also run revdep-rebuild"
+
+ # place symlinks to make the update smoothless
+ for i in ${ROOT}/usr/lib/cups/{backend,filter}/*; do
+ if [ "${i/\*}" == "${i}" ] && ! [ -e ${i/lib/libexec} ]; then
+ ln -s ${i} ${i/lib/libexec}
+ fi
+ done
+ fi
+}
diff --git a/net-print/cups/files/digest-cups-1.2.12 b/net-print/cups/files/digest-cups-1.2.12
new file mode 100644
index 000000000000..8073a9a92cbd
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.2.12
@@ -0,0 +1,3 @@
+MD5 d410658468384b5ba5d04a808f6157fe cups-1.2.12-source.tar.bz2 3788301
+RMD160 598270e37ff8a9b9ff1e667066d6f7e120493e32 cups-1.2.12-source.tar.bz2 3788301
+SHA256 b4ff8e934da7db32d5654360ea9068faa0ed5a00fde02161ae53c2052510d00f cups-1.2.12-source.tar.bz2 3788301