diff options
author | Seemant Kulleen <seemant@gentoo.org> | 2006-11-08 02:33:06 +0000 |
---|---|---|
committer | Seemant Kulleen <seemant@gentoo.org> | 2006-11-08 02:33:06 +0000 |
commit | 046bf593a25be620198001b4266cb613f34126cf (patch) | |
tree | e7e0fa5bf0dccc9f9c74aac32569adc504bfe578 /net-print | |
parent | Fix WANT_AUTOMAKE. (diff) | |
download | gentoo-2-046bf593a25be620198001b4266cb613f34126cf.tar.gz gentoo-2-046bf593a25be620198001b4266cb613f34126cf.tar.bz2 gentoo-2-046bf593a25be620198001b4266cb613f34126cf.zip |
restore 1.2.5 for now
(Portage version: 2.1.2_rc1-r5)
Diffstat (limited to 'net-print')
-rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
-rw-r--r-- | net-print/cups/cups-1.2.5.ebuild | 199 | ||||
-rw-r--r-- | net-print/cups/files/cups-1.2.5.patch | 26 | ||||
-rw-r--r-- | net-print/cups/files/digest-cups-1.2.5 | 3 |
4 files changed, 233 insertions, 1 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 851189e46ab7..399ed11001e5 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,10 @@ # 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: diff --git a/net-print/cups/cups-1.2.5.ebuild b/net-print/cups/cups-1.2.5.ebuild new file mode 100644 index 000000000000..f95a9343c867 --- /dev/null +++ b/net-print/cups/cups-1.2.5.ebuild @@ -0,0 +1,199 @@ +# 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 +} diff --git a/net-print/cups/files/cups-1.2.5.patch b/net-print/cups/files/cups-1.2.5.patch new file mode 100644 index 000000000000..f062e0aa0b2b --- /dev/null +++ b/net-print/cups/files/cups-1.2.5.patch @@ -0,0 +1,26 @@ +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 */ diff --git a/net-print/cups/files/digest-cups-1.2.5 b/net-print/cups/files/digest-cups-1.2.5 new file mode 100644 index 000000000000..8e4e8e9db945 --- /dev/null +++ b/net-print/cups/files/digest-cups-1.2.5 @@ -0,0 +1,3 @@ +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 |