diff options
| -rw-r--r-- | net-print/cups/Manifest | 22 | ||||
| -rw-r--r-- | net-print/cups/cups-1.2.1-r1.ebuild | 164 | ||||
| -rw-r--r-- | net-print/cups/files/digest-cups-1.2.1-r1 | 3 |
3 files changed, 11 insertions, 178 deletions
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 832bd12c2b2b..d8102a55d121 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -72,14 +72,14 @@ EBUILD cups-1.1.23-r7.ebuild 4654 RMD160 3b50b26d2519c60d5f86274dc1d998af69bee78 MD5 28058673f2f754db6b5c8ea6ad9490ac cups-1.1.23-r7.ebuild 4654 RMD160 3b50b26d2519c60d5f86274dc1d998af69bee783 cups-1.1.23-r7.ebuild 4654 SHA256 71115c06cf8608d96b56fb3ba4cab0dd725648938a3e28e0a8af6c294585db39 cups-1.1.23-r7.ebuild 4654 -EBUILD cups-1.2.1-r1.ebuild 5023 RMD160 2a7ee2a3fda098cd52078090b5ad301127ff2e54 SHA1 2f7afa66acc4e05765bc8563fcf33d12a62dbed8 SHA256 4bdc0dedd265df38bcf45ab33a54fdf546c34ba0b6b4fb27effcc68663a27044 -MD5 6236d3a12e8295c8f851fcb948a2cc94 cups-1.2.1-r1.ebuild 5023 -RMD160 2a7ee2a3fda098cd52078090b5ad301127ff2e54 cups-1.2.1-r1.ebuild 5023 -SHA256 4bdc0dedd265df38bcf45ab33a54fdf546c34ba0b6b4fb27effcc68663a27044 cups-1.2.1-r1.ebuild 5023 -MISC ChangeLog 25171 RMD160 f2e51ea5521adb3a9f39f58df046db02212005c7 SHA1 9994b242a4573d56b9911cc7ab4aeaa38da52e57 SHA256 5007f3733713997fba982f48506bed58e0300892eebc50449d9c859974cd0cb8 -MD5 12330a417694c6214d6cb7ddde2abeb3 ChangeLog 25171 -RMD160 f2e51ea5521adb3a9f39f58df046db02212005c7 ChangeLog 25171 -SHA256 5007f3733713997fba982f48506bed58e0300892eebc50449d9c859974cd0cb8 ChangeLog 25171 +EBUILD cups-1.2.1-r2.ebuild 5024 RMD160 417843c950088e224d9cf9878647561341845c8d SHA1 b02040533c11efc44bb68cfc2a53bd892c3ec4b1 SHA256 9d5616aa6fbd03417d05c2fd9c0fc51d956a345ceb9d66192fbfa3c4d7ccde16 +MD5 0471b36c275ab3fffb9d688135c86fa8 cups-1.2.1-r2.ebuild 5024 +RMD160 417843c950088e224d9cf9878647561341845c8d cups-1.2.1-r2.ebuild 5024 +SHA256 9d5616aa6fbd03417d05c2fd9c0fc51d956a345ceb9d66192fbfa3c4d7ccde16 cups-1.2.1-r2.ebuild 5024 +MISC ChangeLog 25418 RMD160 dd7e943c3debeb7a5c34eba93bb95b34137afe11 SHA1 2f6566980724b961fa9449582a53def104ddeb79 SHA256 e01cd7bbfc5d816d0c01ef17129a757c40f5507f04e7b5bd00fe3411f48a3e7b +MD5 8f9c02ac89a24555148be45a20030453 ChangeLog 25418 +RMD160 dd7e943c3debeb7a5c34eba93bb95b34137afe11 ChangeLog 25418 +SHA256 e01cd7bbfc5d816d0c01ef17129a757c40f5507f04e7b5bd00fe3411f48a3e7b ChangeLog 25418 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 @@ -90,6 +90,6 @@ SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/di MD5 abdc9df96d571ef4acff9bba51363e05 files/digest-cups-1.1.23-r7 262 RMD160 d874b0af63ed920fb5c6f2ebf457c319b6e2f752 files/digest-cups-1.1.23-r7 262 SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/digest-cups-1.1.23-r7 262 -MD5 a89cd5824677acfcf778dbd54cbb2664 files/digest-cups-1.2.1-r1 259 -RMD160 8aa0e96163aff3488fca924e02dc76268095cf11 files/digest-cups-1.2.1-r1 259 -SHA256 74e565ea8d6b8d416c3e8f79d8e3043d0cdf95b0784806bf48608fab744048e3 files/digest-cups-1.2.1-r1 259 +MD5 a89cd5824677acfcf778dbd54cbb2664 files/digest-cups-1.2.1-r2 259 +RMD160 8aa0e96163aff3488fca924e02dc76268095cf11 files/digest-cups-1.2.1-r2 259 +SHA256 74e565ea8d6b8d416c3e8f79d8e3043d0cdf95b0784806bf48608fab744048e3 files/digest-cups-1.2.1-r2 259 diff --git a/net-print/cups/cups-1.2.1-r1.ebuild b/net-print/cups/cups-1.2.1-r1.ebuild deleted file mode 100644 index 57a23c92059e..000000000000 --- a/net-print/cups/cups-1.2.1-r1.ebuild +++ /dev/null @@ -1,164 +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.1-r1.ebuild,v 1.11 2006/06/22 07:04:36 genstef Exp $ - -inherit eutils flag-o-matic multilib autotools - -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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="ssl slp pam samba nls gnutls dbus tiff png jpeg" - -DEP="pam? ( virtual/pam ) - ssl? ( - !gnutls? ( >=dev-libs/openssl-0.9.6b ) - gnutls? ( 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 ) - app-text/libpaper" -DEPEND="${DEP} - nls? ( sys-devel/gettext )" -RDEPEND="${DEP} - nls? ( virtual/libintl ) - !virtual/lpr - >=app-text/poppler-0.4.3-r1" -PDEPEND="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} - epatch ${FILESDIR}/cups-1.2.0-bindnow.patch - epatch ${FILESDIR}/cups-1.2.1-ssldir.patch - - # upstream has refused to fix this for me - sed -i -e "s:#if defined(__linux) && defined(LP_POUTPA):#if 0:" backend/usb-unix.c - - # cups does not use autotools "the usual way" and ship a static config.h.in - eaclocal - eautoconf -} - -src_compile() { - local myconf - - use ssl && \ - myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)" - - 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) \ - $(use_enable slp) \ - $(use_enable nls) \ - $(use_enable dbus) \ - $(use_enable png) \ - $(use_enable jpeg) \ - $(use_enable tiff) \ - --enable-libpaper \ - --enable-threads \ - --enable-static \ - --disable-pdftops \ - ${myconf} \ - || 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 ${D}/etc/rc* - # install our init scripts - newinitd ${FILESDIR}/cupsd.init cupsd - - # 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 -} - -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." - einfo - einfo "You need to emerge ghostscript with the cups-USEflag turned on" - 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 -va cups" - ewarn - ewarn "If you are updating from cups-1.1.* you need to remerge every ebuild" - ewarn "that installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:" - ewarn "# FEATURES=-collision-protect emerge -va \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")" - ewarn - einfo "FEATURES=-collision-protect is needed to overwrite the compatibility" - einfo "symlinks installed by this package, it wont be needed on later merges." - ewarn "You should also run revdep-rebuild" - einfo "Rebuilding kdelibs is also a good idea when you want to use it for cups" - - # place symlinks to make the update smoothless - for i in ${ROOT}/usr/lib/cups/{backend,filter}/*; do - [ "${i/\*}" != "${i}" ] && continue; - ln -s ${i} ${i/lib/libexec} - done -} diff --git a/net-print/cups/files/digest-cups-1.2.1-r1 b/net-print/cups/files/digest-cups-1.2.1-r1 deleted file mode 100644 index 90fc088bcc11..000000000000 --- a/net-print/cups/files/digest-cups-1.2.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f804995e3f469bdefedc033510f6e6a5 cups-1.2.1-source.tar.bz2 3475342 -RMD160 84040c5ac65d4a3d13d813fb91f90cbccb211c25 cups-1.2.1-source.tar.bz2 3475342 -SHA256 10fb273b8118858fdce795608065860865432b2d9f1016b53fff1eb340385e45 cups-1.2.1-source.tar.bz2 3475342 |