# ChangeLog for net-print/cups
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.212 2006/11/07 21:59:41 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.213 2006/11/08 02:33:06 seemant Exp $
+
+ 08 Nov 2006; Seemant Kulleen <seemant@gentoo.org> +files/cups-1.2.5.patch,
+ +cups-1.2.5.ebuild:
+ restoring 1.2.5 until the distfile issue is properly sorted
07 Nov 2006; Patrick McLean <chutzpah@gentoo.org> cups-1.1.23-r8.ebuild,
cups-1.2.6.ebuild:
MD5 4cfb62e82b82ffc2291f3bdfcc21e600 files/cups-1.2.1-ssldir.patch 509
RMD160 bc0f4927e4260b57bb898f55d5f4215489d94a71 files/cups-1.2.1-ssldir.patch 509
SHA256 e536ae455fdbee0fdea6bae2a800060c81c66ff7ab007ecd317b99b8b9552be7 files/cups-1.2.1-ssldir.patch 509
+AUX cups-1.2.5.patch 1208 RMD160 7bae5ce8ae2266be441a3373283e30ffbd8d1279 SHA1 3b0b1fe7654adf0ac3b8abcc713d4c1a4f68279a SHA256 8613ee1343489b5324c09e363ff6dde00e51fb43f04b80b714f2470d48f9740f
+MD5 f66a1efa00c0c292e8eb896e61c6066f files/cups-1.2.5.patch 1208
+RMD160 7bae5ce8ae2266be441a3373283e30ffbd8d1279 files/cups-1.2.5.patch 1208
+SHA256 8613ee1343489b5324c09e363ff6dde00e51fb43f04b80b714f2470d48f9740f files/cups-1.2.5.patch 1208
AUX cups-gcc4-amd64.patch 566 RMD160 12372ca22d689df7f3129d43ba1b7e6c9161868b SHA1 9e23ed973685c279edfee76fc0a7a9c6fd94a103 SHA256 e5d7cfb3a96731362008ff7e103cb3156059b0b86031564cc0a3e4bf9ea334fa
MD5 7888ddf6a0c4cfb38b8882651e22d66c files/cups-gcc4-amd64.patch 566
RMD160 12372ca22d689df7f3129d43ba1b7e6c9161868b files/cups-gcc4-amd64.patch 566
RMD160 17b481f70cb47acff4272ec143261e920459d0bd files/pdftops.pl 5624
SHA256 60fc863f11c5b114b5bfd8bbba905abca5526c92581f7a5b5570e8723a4aeebc files/pdftops.pl 5624
DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e
+DIST cups-1.2.5-source.tar.bz2 3565622 RMD160 5415dc0f111cfdcfc34b801b4e22e7a27bf5eadc SHA1 25703de2bc09aa161bfd1ece88d30926269156df SHA256 43569d152bd0665729bbe3c50c3a611c1425b679745a009fbd7f9bfd5631f19a
DIST cups-1.2.6-source.tar.bz2 88939 RMD160 6fa692f6d75ce8d9d7cadcb3c51c6b4836a1ddf2 SHA1 6eacbf4364faa8513fa9844de672f5b169213206 SHA256 b34c9110d6c79da0d6293fe0c945de29d6399c386205ffc872d9ae09135e9fb4
EBUILD cups-1.1.23-r8.ebuild 5010 RMD160 dcfafdd38cb6d6ae4457a3d01e320e2ab14c05fd SHA1 db0d26316516da0a744f242e4ca53adaa6160efd SHA256 7affefc610bbef90b5024664f692ecec599eba5c3fa7b76266b51f5f972b5a04
MD5 2443fd46170a523bf9722e0684ddb257 cups-1.1.23-r8.ebuild 5010
RMD160 dcfafdd38cb6d6ae4457a3d01e320e2ab14c05fd cups-1.1.23-r8.ebuild 5010
SHA256 7affefc610bbef90b5024664f692ecec599eba5c3fa7b76266b51f5f972b5a04 cups-1.1.23-r8.ebuild 5010
+EBUILD cups-1.2.5.ebuild 5817 RMD160 f0df452d3e0cbb537f1edba718a2b81d884846b2 SHA1 e84479f9a0e22be419ee8cc74807120302d80f26 SHA256 b9113d266eca7f414f0b9d6ef9ce290855928b1ceb54df43269c6f9c4a3cc10a
+MD5 ee6bc70d4cbba482aa2cac2f35541e7c cups-1.2.5.ebuild 5817
+RMD160 f0df452d3e0cbb537f1edba718a2b81d884846b2 cups-1.2.5.ebuild 5817
+SHA256 b9113d266eca7f414f0b9d6ef9ce290855928b1ceb54df43269c6f9c4a3cc10a cups-1.2.5.ebuild 5817
EBUILD cups-1.2.6.ebuild 5782 RMD160 9446529319af3c526d2057110bc92cbbcdc6cd1f SHA1 9bab979b00b0f8e3eafabd6f072bc1ed565c032a SHA256 1a8bd92800a44808134547471406d0b32f22722c15fdc1d0f152191a969782f5
MD5 5e48095635363bea6bceb42e21a71f33 cups-1.2.6.ebuild 5782
RMD160 9446529319af3c526d2057110bc92cbbcdc6cd1f cups-1.2.6.ebuild 5782
SHA256 1a8bd92800a44808134547471406d0b32f22722c15fdc1d0f152191a969782f5 cups-1.2.6.ebuild 5782
-MISC ChangeLog 30290 RMD160 107af503d17cad9531992ec878cf8f0294e7e9d4 SHA1 8229116d0b915d1c9582f7f250a0fc8a1b52ee5c SHA256 218f38dda39db76d111c36f1733d10ab97a0ce6b7435253bdeac6caf2fdcd56a
-MD5 85e303e0130de8cd7af78dcfda049750 ChangeLog 30290
-RMD160 107af503d17cad9531992ec878cf8f0294e7e9d4 ChangeLog 30290
-SHA256 218f38dda39db76d111c36f1733d10ab97a0ce6b7435253bdeac6caf2fdcd56a ChangeLog 30290
+MISC ChangeLog 30451 RMD160 de3f1dd5a9dc952edafa6240f06cf3760da3a0d3 SHA1 e8e21df1b1f29e1f1e6cce3ab79a552a29306f7b SHA256 deba5d6ec3dc15e5cc16574750797e0dd39a2dd2cc493912810db8a9a1af65cb
+MD5 4b6833ad7eee3f267a4628a50150aac6 ChangeLog 30451
+RMD160 de3f1dd5a9dc952edafa6240f06cf3760da3a0d3 ChangeLog 30451
+SHA256 deba5d6ec3dc15e5cc16574750797e0dd39a2dd2cc493912810db8a9a1af65cb ChangeLog 30451
MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
MD5 abdc9df96d571ef4acff9bba51363e05 files/digest-cups-1.1.23-r8 262
RMD160 d874b0af63ed920fb5c6f2ebf457c319b6e2f752 files/digest-cups-1.1.23-r8 262
SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/digest-cups-1.1.23-r8 262
+MD5 b8e30436b4c06424b912140b59189cb5 files/digest-cups-1.2.5 259
+RMD160 71eb4e72bce763377f3f0aa0529bb57845026ad4 files/digest-cups-1.2.5 259
+SHA256 02c5089d6f092247fb7edc49dee8dad9dabf7ad7b182368adcdde7451d59cb6e files/digest-cups-1.2.5 259
MD5 6529eb963e2113b72891688f07f0849d files/digest-cups-1.2.6 253
RMD160 2a8fc6f35e3e4bbeee34533c12a926d859aa85d2 files/digest-cups-1.2.6 253
SHA256 dcc2a5127a4e5206b8607dbd06a69163aae700bcccc1d38f72edbef5bf6d1e74 files/digest-cups-1.2.6 253
--- /dev/null
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.5.ebuild,v 1.4 2006/11/08 02:33:06 seemant 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.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="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="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 )
+ 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}
+ 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() {
+ 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
+ epatch ${FILESDIR}/cups-1.2.5.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) \
+ --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
+
+ keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
+ /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp
+
+ # .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
+}
+
+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
+}
--- /dev/null
+diff -ur cups-1.2.5.orig/scheduler/ipp.c cups-1.2.5/scheduler/ipp.c
+--- cups-1.2.5.orig/scheduler/ipp.c 2006-10-21 02:35:26.000000000 +0200
++++ cups-1.2.5/scheduler/ipp.c 2006-10-21 02:35:41.000000000 +0200
+@@ -4020,14 +4020,14 @@
+ if ((!strcmp(system_paper, "Letter") && have_letter) ||
+ (!strcmp(system_paper, "A4") && have_a4))
+ {
+- num_defaults = ppd_add_default("PageSize", system_paper,
+- num_defaults, &defaults);
+- num_defaults = ppd_add_default("PageRegion", system_paper,
+- num_defaults, &defaults);
+- num_defaults = ppd_add_default("PaperDimension", system_paper,
+- num_defaults, &defaults);
+- num_defaults = ppd_add_default("ImageableArea", system_paper,
+- num_defaults, &defaults);
++ num_defaults = cupsAddOption("PageSize", system_paper,
++ num_defaults, &defaults);
++ num_defaults = cupsAddOption("PageRegion", system_paper,
++ num_defaults, &defaults);
++ num_defaults = cupsAddOption("PaperDimension", system_paper,
++ num_defaults, &defaults);
++ num_defaults = cupsAddOption("ImageableArea", system_paper,
++ num_defaults, &defaults);
+ }
+ }
+ #endif /* HAVE_LIBPAPER */
--- /dev/null
+MD5 3e5d2c127890fd3ed97e2249c278b6e8 cups-1.2.5-source.tar.bz2 3565622
+RMD160 5415dc0f111cfdcfc34b801b4e22e7a27bf5eadc cups-1.2.5-source.tar.bz2 3565622
+SHA256 43569d152bd0665729bbe3c50c3a611c1425b679745a009fbd7f9bfd5631f19a cups-1.2.5-source.tar.bz2 3565622
projects / gentoo.git / commitdiff