From: Stefan Schweizer Date: Tue, 20 Mar 2007 13:31:37 +0000 (+0000) Subject: version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2b981de5e3d54f942d1e5877bb6c4c071757266f;p=gentoo.git version bump Package-Manager: portage-2.1.2.2 --- diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 88f82e9dd66a..fd2a711b5289 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.222 2007/02/19 20:59:49 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.223 2007/03/20 13:31:37 genstef Exp $ + +*cups-1.2.9 (20 Mar 2007) + + 20 Mar 2007; +cups-1.2.9.ebuild: + version bump *cups-1.2.8 (19 Feb 2007) diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 9957e769d349..8e3c7b65a1a1 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -54,6 +54,7 @@ DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590d DIST cups-1.2.6-source.tar.bz2 3566806 RMD160 a239738f711168cb82c11ee20a7aa92b070e5811 SHA1 1e12d2db23c6a46ae8960b9b765be0f1b829bbac SHA256 cdad0e2e461121257e740b8cb1111c7266cea434dd532a8bcc69c69adffe8aa8 DIST cups-1.2.7-source.tar.bz2 3585758 RMD160 323bad80f9af3c53eec20a89c44afe26675424fa SHA1 1024f1d4995d8f765dc79ce507eac2be8e0ccd45 SHA256 e7485d6b3dcbd338a2361aff66c516f8dfafc1c81ea5b01396f6ee5f365c4eb3 DIST cups-1.2.8-source.tar.bz2 3632509 RMD160 43d23bd6ef1f396d57f4b57089e6e31fe1304346 SHA1 690890b7d2f779a872e1464fd354498f7da72fee SHA256 1fea71cc90dcb18fcc86f59821b91b6f78bb623ddb5998e17293b67d9dc67e16 +DIST cups-1.2.9-source.tar.bz2 3617594 RMD160 8af1323a8006c3736a15c25c89773292a129161d SHA1 58e67800103e699b4699f17db41da33ddea360fb SHA256 9764a76adf41d72ad4142df8f8a0117507092623a58212a463dfb8a2dced7f09 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 @@ -70,10 +71,14 @@ EBUILD cups-1.2.8.ebuild 5874 RMD160 82532f842a80bc182f9fe9ffaaa8763f58b567e1 SH MD5 040da3e6a3a378c2a19c346d80eafc14 cups-1.2.8.ebuild 5874 RMD160 82532f842a80bc182f9fe9ffaaa8763f58b567e1 cups-1.2.8.ebuild 5874 SHA256 190b4508f227bc2758477b5863631ced3efe292b48ca32e8b5a577af1687d339 cups-1.2.8.ebuild 5874 -MISC ChangeLog 31385 RMD160 2f467b6be6c39391a0534f7a651217afa03df972 SHA1 90aa79a83b22f39e3036f45cc85217e23165a1b4 SHA256 9888928dc80b25b4af1a8278bbd5864c95a64f1d40d2f1c85d1c5a12683ac6f8 -MD5 5ea6b3a4802d4a2cf9339bf19a0dd9e5 ChangeLog 31385 -RMD160 2f467b6be6c39391a0534f7a651217afa03df972 ChangeLog 31385 -SHA256 9888928dc80b25b4af1a8278bbd5864c95a64f1d40d2f1c85d1c5a12683ac6f8 ChangeLog 31385 +EBUILD cups-1.2.9.ebuild 5868 RMD160 66bbaaaabe26353bfb64028c3cf291a158e61727 SHA1 4d904fbc54b903c4bd15a3f8452e0cd183b29dce SHA256 812ec0c098d8638607f8e83c3bd48d58091ed664011def9e7f33faf3a332bb67 +MD5 b54764e0c7ff3ebcf4601566380caaae cups-1.2.9.ebuild 5868 +RMD160 66bbaaaabe26353bfb64028c3cf291a158e61727 cups-1.2.9.ebuild 5868 +SHA256 812ec0c098d8638607f8e83c3bd48d58091ed664011def9e7f33faf3a332bb67 cups-1.2.9.ebuild 5868 +MISC ChangeLog 31483 RMD160 00484de9ff2e8da5ef527440bb5690d63e743f5d SHA1 81ba60ac72a1ba3d2a5a6ccf30ffb48c019ec689 SHA256 142bd9f2ba1e381df0b97669bca8c5db1455e7e62de18f655c4fea45dbd3af13 +MD5 2c4193228789e296f93645c6370edd9c ChangeLog 31483 +RMD160 00484de9ff2e8da5ef527440bb5690d63e743f5d ChangeLog 31483 +SHA256 142bd9f2ba1e381df0b97669bca8c5db1455e7e62de18f655c4fea45dbd3af13 ChangeLog 31483 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 @@ -90,3 +95,6 @@ SHA256 64b0ad8d15b34845d9191c0b960a2fd6f9f1a96ba62f67634bc53e17d9214e94 files/di MD5 b159181e6a934b187d0f1b8f5ecc98e9 files/digest-cups-1.2.8 259 RMD160 51507a321ff5b2f959a84da972ba6ae312ce83ba files/digest-cups-1.2.8 259 SHA256 d9827abb94109590a418031c46b208c0e3bcce60ef7901cc5a303a6ef70f53df files/digest-cups-1.2.8 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 diff --git a/net-print/cups/cups-1.2.9.ebuild b/net-print/cups/cups-1.2.9.ebuild new file mode 100644 index 000000000000..31da28e10c5f --- /dev/null +++ b/net-print/cups/cups-1.2.9.ebuild @@ -0,0 +1,200 @@ +# 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.9.ebuild,v 1.1 2007/03/20 13:31:37 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="~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} + 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 + + # 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 + + 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 +} + +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.9 b/net-print/cups/files/digest-cups-1.2.9 new file mode 100644 index 000000000000..fba5093dc262 --- /dev/null +++ b/net-print/cups/files/digest-cups-1.2.9 @@ -0,0 +1,3 @@ +MD5 73433d7e8c04b66702732928aaf087b8 cups-1.2.9-source.tar.bz2 3617594 +RMD160 8af1323a8006c3736a15c25c89773292a129161d cups-1.2.9-source.tar.bz2 3617594 +SHA256 9764a76adf41d72ad4142df8f8a0117507092623a58212a463dfb8a2dced7f09 cups-1.2.9-source.tar.bz2 3617594