version bump
authorStefan Schweizer <genstef@gentoo.org>
Sat, 7 Apr 2007 12:22:55 +0000 (12:22 +0000)
committerStefan Schweizer <genstef@gentoo.org>
Sat, 7 Apr 2007 12:22:55 +0000 (12:22 +0000)
Package-Manager: portage-2.1.2.3

net-print/cups/ChangeLog
net-print/cups/cups-1.2.10.ebuild [moved from net-print/cups/cups-1.2.8.ebuild with 94% similarity]
net-print/cups/cups-1.2.7.ebuild [deleted file]
net-print/cups/files/digest-cups-1.2.10 [new file with mode: 0644]
net-print/cups/files/digest-cups-1.2.7 [deleted file]
net-print/cups/files/digest-cups-1.2.8 [deleted file]

index 7c36990c658ecd1bd72687d3403531d6406f78e8..e3202bcfdf54e31f8bd8b41c09ec2c8354a7793a 100644 (file)
@@ -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.230 2007/03/29 14:31:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.231 2007/04/07 12:22:55 genstef Exp $
+
+*cups-1.2.10 (07 Apr 2007)
+
+  07 Apr 2007; <stefan@gentoo.org> +cups-1.2.10.ebuild:
+  version bump
 
   29 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> cups-1.2.9.ebuild:
   Stable on alpha wrt bug #170881.
similarity index 94%
rename from net-print/cups/cups-1.2.8.ebuild
rename to net-print/cups/cups-1.2.10.ebuild
index 16d1cf90ec2aff415c0e29f6a03f01737dafd0c4..e76160e5100728d92b78e4f9c4b902c11aa739ba 100644 (file)
@@ -1,6 +1,6 @@
 # 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.8.ebuild,v 1.1 2007/02/19 20:59:49 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.10.ebuild,v 1.1 2007/04/07 12:22:55 genstef Exp $
 
 WANT_AUTOMAKE=latest
 
@@ -10,12 +10,12 @@ MY_P=${P/_}
 
 DESCRIPTION="The Common Unix Printing System"
 HOMEPAGE="http://www.cups.org/"
-SRC_URI="http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/${PV}/${MY_P}-source.tar.bz2"
+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"
+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 )
diff --git a/net-print/cups/cups-1.2.7.ebuild b/net-print/cups/cups-1.2.7.ebuild
deleted file mode 100644 (file)
index c46c535..0000000
+++ /dev/null
@@ -1,198 +0,0 @@
-# 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.7.ebuild,v 1.1 2006/11/17 17:31:31 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.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/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
-
-       # 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
-}
diff --git a/net-print/cups/files/digest-cups-1.2.10 b/net-print/cups/files/digest-cups-1.2.10
new file mode 100644 (file)
index 0000000..79f699d
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 aad696a480b618e61bc7dab11623d3ac cups-1.2.10-source.tar.bz2 3618084
+RMD160 85b3bbd46a6fc097891c571ffad8e5e46693743f cups-1.2.10-source.tar.bz2 3618084
+SHA256 601b3b9256c55361477427c3e8db56c9ee4e141762814aea590bcf110a95bb36 cups-1.2.10-source.tar.bz2 3618084
diff --git a/net-print/cups/files/digest-cups-1.2.7 b/net-print/cups/files/digest-cups-1.2.7
deleted file mode 100644 (file)
index dcca114..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bf44783d9b46130bee9f2995e6055470 cups-1.2.7-source.tar.bz2 3585758
-RMD160 323bad80f9af3c53eec20a89c44afe26675424fa cups-1.2.7-source.tar.bz2 3585758
-SHA256 e7485d6b3dcbd338a2361aff66c516f8dfafc1c81ea5b01396f6ee5f365c4eb3 cups-1.2.7-source.tar.bz2 3585758
diff --git a/net-print/cups/files/digest-cups-1.2.8 b/net-print/cups/files/digest-cups-1.2.8
deleted file mode 100644 (file)
index d9fd5a3..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d2cc0604113d5300b7b3e823b660d04a cups-1.2.8-source.tar.bz2 3632509
-RMD160 43d23bd6ef1f396d57f4b57089e6e31fe1304346 cups-1.2.8-source.tar.bz2 3632509
-SHA256 1fea71cc90dcb18fcc86f59821b91b6f78bb623ddb5998e17293b67d9dc67e16 cups-1.2.8-source.tar.bz2 3632509