From: Stefan Schweizer Date: Wed, 14 Jun 2006 17:04:01 +0000 (+0000) Subject: Add more useflags thanks to Gilles Dartiguelongue in bug 136787... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4b6cf3d7d97dee28ce9f444d895ac1c5d16a9e8d;p=gentoo.git Add more useflags thanks to Gilles Dartiguelongue in bug 136787, also improve postinst and add automatic update-help-symlinks Package-Manager: portage-2.1 --- diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 672bd4944f53..24cbc0e67c1a 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -64,26 +64,18 @@ EBUILD cups-1.1.23-r1.ebuild 4130 RMD160 d2b38e6f29d8f6a9cd0a4753d945d120ab8c4db MD5 b92beaae46fa3940593e9915f4feb8f0 cups-1.1.23-r1.ebuild 4130 RMD160 d2b38e6f29d8f6a9cd0a4753d945d120ab8c4dbd cups-1.1.23-r1.ebuild 4130 SHA256 f7eea788f7fab983696ddf7d68f33dc6cc542ae9a7d50658c1195202cfe90fb5 cups-1.1.23-r1.ebuild 4130 -EBUILD cups-1.1.23-r4.ebuild 4367 RMD160 f0d6ed7b6c7566155fe7d66809d1bce69e87f5cc SHA1 c69b0485222d55be55b1a81ebd53a40c8b535ef1 SHA256 0ac1c336d55d768457909e4e59da0abcec89987bdcfe08be1876870362016ae3 -MD5 2cb2b2e2a87d4e2bc1a2419508c76b2c cups-1.1.23-r4.ebuild 4367 -RMD160 f0d6ed7b6c7566155fe7d66809d1bce69e87f5cc cups-1.1.23-r4.ebuild 4367 -SHA256 0ac1c336d55d768457909e4e59da0abcec89987bdcfe08be1876870362016ae3 cups-1.1.23-r4.ebuild 4367 EBUILD cups-1.1.23-r7.ebuild 4608 RMD160 632e6dd43be3eb0c12ea172492b5b39902c9f9e5 SHA1 8a7028adae145d2dfc968ca8d47f91f7d26464e5 SHA256 40e886b9a539b594135464a3fd6a8b63000878e8b1b7e2ebc6d29b22ae6bbb35 MD5 bf5afc4432a75abcd25c934233de0406 cups-1.1.23-r7.ebuild 4608 RMD160 632e6dd43be3eb0c12ea172492b5b39902c9f9e5 cups-1.1.23-r7.ebuild 4608 SHA256 40e886b9a539b594135464a3fd6a8b63000878e8b1b7e2ebc6d29b22ae6bbb35 cups-1.1.23-r7.ebuild 4608 -EBUILD cups-1.2.1-r1.ebuild 4003 RMD160 e3cadfee9150d5ad4b7be0f6bfc2c8e8b4419552 SHA1 c230c2e170dac2b101a6a65737d93077e674fced SHA256 6fb014d4497dd9c78f220e93226e355720266f048699a6ffaa6734bbbaab6f63 -MD5 923a2c2a95fd93feac48bc5ecee2d2d4 cups-1.2.1-r1.ebuild 4003 -RMD160 e3cadfee9150d5ad4b7be0f6bfc2c8e8b4419552 cups-1.2.1-r1.ebuild 4003 -SHA256 6fb014d4497dd9c78f220e93226e355720266f048699a6ffaa6734bbbaab6f63 cups-1.2.1-r1.ebuild 4003 -EBUILD cups-1.2.1.ebuild 4046 RMD160 1f53ad79318aacfde5c82b19a8c5d4ce76e31b20 SHA1 e35a63b61ef5c68e13ca4e802d3b73286e19a01d SHA256 581f1d375871676c085bacb2494d6d1c30bfb18403f982d3ad06a080ad507dfb -MD5 9e97662b8b617be6cf75225a2d1129bc cups-1.2.1.ebuild 4046 -RMD160 1f53ad79318aacfde5c82b19a8c5d4ce76e31b20 cups-1.2.1.ebuild 4046 -SHA256 581f1d375871676c085bacb2494d6d1c30bfb18403f982d3ad06a080ad507dfb cups-1.2.1.ebuild 4046 -MISC ChangeLog 23295 RMD160 23f08980284f6bd39127ceb484379cab499a566d SHA1 d70be0bba9ecd4183ccef6b7094c950796129d2e SHA256 49addf7ec22ef8e9df50a18af5e8fab8a27ab5df16d8b8fbf9a083a7721239c7 -MD5 07b9d5dd446c5b753df1766063e0a7c9 ChangeLog 23295 -RMD160 23f08980284f6bd39127ceb484379cab499a566d ChangeLog 23295 -SHA256 49addf7ec22ef8e9df50a18af5e8fab8a27ab5df16d8b8fbf9a083a7721239c7 ChangeLog 23295 +EBUILD cups-1.2.1-r1.ebuild 4594 RMD160 4dd8490496961dc35887911af2a1df207809b507 SHA1 26f4e8a650d9011d65dce1af8a3e809ed4ee7c0d SHA256 94356e95bad5da354900cca3af35e62a1fd6aa0bcbf88754d6a86f66d5a111db +MD5 857b7e7f1effa54713e5a23324ebd209 cups-1.2.1-r1.ebuild 4594 +RMD160 4dd8490496961dc35887911af2a1df207809b507 cups-1.2.1-r1.ebuild 4594 +SHA256 94356e95bad5da354900cca3af35e62a1fd6aa0bcbf88754d6a86f66d5a111db cups-1.2.1-r1.ebuild 4594 +MISC ChangeLog 23523 RMD160 b4ed2b869e2a5ca353a8997bc630352d992302fc SHA1 ceb999fbf9d51c76bab9aec607ddf40674a8972c SHA256 9d56c0958e49f0a80db2f4241eea05eea78c05383963dd79b9af70a9aee47477 +MD5 67477c36d2d31a180e1aaa76e73e5646 ChangeLog 23523 +RMD160 b4ed2b869e2a5ca353a8997bc630352d992302fc ChangeLog 23523 +SHA256 9d56c0958e49f0a80db2f4241eea05eea78c05383963dd79b9af70a9aee47477 ChangeLog 23523 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 @@ -91,15 +83,9 @@ SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata MD5 abdc9df96d571ef4acff9bba51363e05 files/digest-cups-1.1.23-r1 262 RMD160 d874b0af63ed920fb5c6f2ebf457c319b6e2f752 files/digest-cups-1.1.23-r1 262 SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/digest-cups-1.1.23-r1 262 -MD5 abdc9df96d571ef4acff9bba51363e05 files/digest-cups-1.1.23-r4 262 -RMD160 d874b0af63ed920fb5c6f2ebf457c319b6e2f752 files/digest-cups-1.1.23-r4 262 -SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/digest-cups-1.1.23-r4 262 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 259 -RMD160 8aa0e96163aff3488fca924e02dc76268095cf11 files/digest-cups-1.2.1 259 -SHA256 74e565ea8d6b8d416c3e8f79d8e3043d0cdf95b0784806bf48608fab744048e3 files/digest-cups-1.2.1 259 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 diff --git a/net-print/cups/cups-1.1.23-r4.ebuild b/net-print/cups/cups-1.1.23-r4.ebuild deleted file mode 100644 index 2e11496fb3f2..000000000000 --- a/net-print/cups/cups-1.1.23-r4.ebuild +++ /dev/null @@ -1,159 +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.1.23-r4.ebuild,v 1.16 2006/02/03 21:43:54 genstef Exp $ - -inherit eutils flag-o-matic pam - -MY_P=${P/_/} - -DESCRIPTION="The Common Unix Printing System" -HOMEPAGE="http://www.cups.org/" -SRC_URI="ftp://ftp2.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2 -ftp://ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2 -ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" -IUSE="ssl slp pam samba nls gnutls" - -DEP="pam? ( virtual/pam ) - ssl? ( - !gnutls? ( >=dev-libs/openssl-0.9.6b ) - gnutls? ( net-libs/gnutls ) - ) - slp? ( >=net-libs/openslp-1.0.4 ) - nls? ( sys-devel/gettext ) - >=media-libs/libpng-1.2.1 - >=media-libs/tiff-3.5.5 - >=media-libs/jpeg-6b" -DEPEND="${DEP} - >=sys-devel/autoconf-2.58" -RDEPEND="${DEP} - !virtual/lpr - >=app-text/poppler-0.4.3-r1" -PDEPEND="samba? ( >=net-fs/samba-3.0.8 )" -PROVIDE="virtual/lpr" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - enewgroup lp - enewuser lp -1 -1 -1 lp -} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/disable-strip.patch - epatch ${FILESDIR}/cups-gcc4-amd64.patch #79791 - epatch ${FILESDIR}/cups-gentooalt.patch - epatch ${FILESDIR}/cups-lppasswd-setXid.patch - WANT_AUTOCONF=2.5 autoconf || die - - # disable builtin xpdf - sed -i -e "s:pdftops::" Makefile -} - -src_compile() { - - local myconf - use amd64 && replace-flags -Os -O2 - - use ssl && \ - myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)" - - econf \ - --with-cups-user=lp \ - --with-cups-group=lp \ - --localstatedir=/var \ - $(use_enable pam) \ - $(use_enable ssl) \ - $(use_enable slp) \ - $(use_enable nls) \ - ${myconf} \ - || die "econf failed" - - emake || die "compile problem" -} - -src_test() { - # 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 - true -} - -src_install() { - dodir /var/spool /var/log/cups /etc/cups - - make \ - LOCALEDIR=${D}/usr/share/locale \ - DOCDIR=${D}/usr/share/cups/docs \ - REQUESTS=${D}/var/spool/cups \ - SERVERBIN=${D}/usr/$(get_libdir)/cups \ - DATADIR=${D}/usr/share/cups \ - INCLUDEDIR=${D}/usr/include \ - AMANDIR=${D}/usr/share/man \ - PMANDIR=${D}/usr/share/man \ - MANDIR=${D}/usr/share/man \ - SERVERROOT=${D}/etc/cups \ - LOGDIR=${D}/var/log/cups \ - SBINDIR=${D}/usr/sbin \ - PAMDIR=${D}/etc/pam.d \ - EXEC_PREFIX=${D}/usr \ - LIBDIR=${D}/usr/$(get_libdir) \ - BINDIR=${D}/usr/bin \ - bindir=${D}/usr/bin \ - INITDIR=${D}/etc \ - PREFIX=${D} \ - install || die "install problem" - - dodoc {CHANGES,CREDITS,ENCRYPTION,LICENSE,README}.txt - dosym /usr/share/cups/docs /usr/share/doc/${PF}/html - - # cleanups - rm -rf ${D}/etc/init.d ${D}/etc/pam.d ${D}/etc/rc* ${D}/usr/share/man/cat* \ - ${D}/etc/cups/{certs,interfaces,ppd} ${D}/var - - sed -i -e "s:^#\(DocumentRoot\).*:\1 /usr/share/cups/docs:" \ - -e "s:^#\(SystemGroup\).*:\1 lp:" \ - -e "s:^#\(User\).*:\1 lp:" \ - -e "s:^#\(Group\).*:\1 lp:" \ - ${D}/etc/cups/cupsd.conf - - pamd_mimic_system cups auth account - - newinitd ${FILESDIR}/cupsd.rc6 cupsd - insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd - - # allow raw printing - dosed "s:#application/octet-stream:application/octet-stream:" /etc/cups/mime.types /etc/cups/mime.convs - - # install pdftops filter - exeinto /usr/lib/cups/filter/ - newexe ${FILESDIR}/pdftops.pl pdftops - dosed "s:/usr/local:/usr:" /usr/lib/cups/filter/pdftops -} - -pkg_preinst() { - # cleanups - [ -n "${PN}" ] && rm -fR /usr/share/doc/${PN}-* -} - -pkg_postinst() { - install -d -m0755 ${ROOT}/var/log/cups - install -d -m0755 ${ROOT}/var/spool - install -m0700 -o lp -d ${ROOT}/var/spool/cups - install -m1700 -o lp -d ${ROOT}/var/spool/cups/tmp - install -m0711 -o lp -d ${ROOT}/etc/cups/certs - install -d -m0755 ${ROOT}/etc/cups/{interfaces,ppd} - - einfo "If you're using a USB printer, \"emerge coldplug; rc-update add" - einfo "coldplug boot\" is something you should probably do. This" - einfo "will allow any USB kernel modules (if present) to be loaded" - einfo "automatically at boot." - einfo - einfo "For more information about installing a printer take a look at:" - einfo "http://www.gentoo.org/doc/en/printing-howto.xml." -} diff --git a/net-print/cups/cups-1.2.1.ebuild b/net-print/cups/cups-1.2.1.ebuild deleted file mode 100644 index 88f3e9ec861e..000000000000 --- a/net-print/cups/cups-1.2.1.ebuild +++ /dev/null @@ -1,143 +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.ebuild,v 1.3 2006/06/05 18:47:34 genstef Exp $ - -inherit eutils pam 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="ssl slp pam samba nls gnutls dbus" - -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 ) - >=media-libs/libpng-1.2.1 - >=media-libs/tiff-3.5.5 - >=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 - - # 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/doc/${PF}/html \ - --with-bindnow=$(bindnow-flags) \ - $(use_enable pam) \ - $(use_enable ssl) \ - $(use_enable slp) \ - $(use_enable nls) \ - $(use_enable dbus) \ - --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() { - make BUILDROOT=${D} install || die "make install failed" - - # cleanups - rm -rf ${D}/etc/init.d ${D}/etc/pam.d ${D}/etc/rc* ${D}/usr/share/man/cat* - - dodoc {CHANGES,CREDITS,LICENSE,README}.txt - - pamd_mimic_system cups auth account - newinitd ${FILESDIR}/cupsd.rc6 cupsd - - sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" ${D}/etc/xinetd.d/cups-lpd - - # install pdftops filter - exeinto /usr/libexec/cups/filter/ - newexe ${FILESDIR}/pdftops.pl pdftops - - fowners lp:lp /var/log/cups /var/run/cups/certs /var/cache/cups \ - /var/spool/cups/tmp /var/spool/cups /etc/cups/{,interfaces,ppd} - keepdir /var/log/cups /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp -} - -pkg_preinst() { - # cleanups - [ -n "${PN}" ] && rm -fR /usr/share/doc/${PN}-* -} - -pkg_postinst() { - einfo "Remote printing: change " - echo "Listen localhost:631" - einfo "to" - echo "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 "If you are updating from cups-1.1.* you need to remerge every ebuild" - ewarn "that installed into /usr/lib/cups: \"emerge -va \$(qfile -qC /usr/lib/cups)\"" -} diff --git a/net-print/cups/files/digest-cups-1.1.23-r4 b/net-print/cups/files/digest-cups-1.1.23-r4 deleted file mode 100644 index 368d38b252b6..000000000000 --- a/net-print/cups/files/digest-cups-1.1.23-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 8705521 -RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 cups-1.1.23-source.tar.bz2 8705521 -SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e cups-1.1.23-source.tar.bz2 8705521 diff --git a/net-print/cups/files/digest-cups-1.2.1 b/net-print/cups/files/digest-cups-1.2.1 deleted file mode 100644 index 90fc088bcc11..000000000000 --- a/net-print/cups/files/digest-cups-1.2.1 +++ /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