Version bump. Added fax and parport local USE flags. Dependency cleanups.

Package-Manager: portage-2.1.2.4

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 1400e3d1cded847963a7ec3e9f72b2e5885799ea..8f2ca2792f2116043b5292d77e283a49501348f0 100644 (file)
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.60 2007/04/23 22:29:26 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.61 2007/04/27 06:58:42 calchan Exp $
+
+*hplip-1.7.4a (27 Apr 2007)
+
+  27 Apr 2007; Denis Dupeyron <calchan@gentoo.org> metadata.xml,
+  +hplip-1.7.4a.ebuild:
+  Version bump. Added fax and parport local USE flags. Dependency cleanups.
 
 *hplip-1.7.4 (23 Apr 2007)
 

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 5109ab2f60605a19697907ba13c87682811177da..efc0133706286f7bc7c1dcc898965d6d1b9f9e07 100644 (file)
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -6,6 +6,7 @@ DIST foomatic-db-hpijs-20060720.tar.gz 98252 RMD160 0c2c09f3cea6fc2a8e5da216bd99
 DIST hplip-1.6.10.tar.gz 10561620 RMD160 3608757fca36865528565c0c40571d91a936fd3f SHA1 7c877cac132fc8695c693800c7e34322bdc8d858 SHA256 45f4eafd4568a06889bf4b996a3c75ef571a157b921f56b027b567766d8e239f
 DIST hplip-1.7.3.tar.gz 13556732 RMD160 dfed95da08f6d5384759b60fc49e8f7cdcbd5aa4 SHA1 5b35c68ca0c1b96a0edadbae144d504319f91843 SHA256 13276261eef92167bf1d36fe7331775a3c2428ab06cf34e68fd1e2409b1c614e
 DIST hplip-1.7.4.tar.gz 13565392 RMD160 1e1cf865be6507fed0cc174eff5ad55002ea435a SHA1 215f7a295357d5e3f6133bd96f1450178abf5c64 SHA256 cb9c3531897af9613932fb9896ed2696f8903dd44b2a385a2faff0b819337aa5
+DIST hplip-1.7.4a.tar.gz 13566965 RMD160 e2777b8b065abe385bfe557b9eed86848029e2c9 SHA1 98fcb0ce13ee7d9f17cc6c61c568528dd9cbf71d SHA256 903957b1b1aa86438d546a205a3d526a600b1e56754a5ba5ce99228a26cc475e
 EBUILD hplip-1.6.10.ebuild 3673 RMD160 cb97ee29e40405d1d9c2cddd523fedafb9a04f27 SHA1 e5f04b956ea421745c3986bd9c6764d7401324cb SHA256 ce12d77789f659fc57452d219cffcc729f7979317c81f958c09988cb58bea8ae
 MD5 acbc7941c0e137d038603c41a6b71d27 hplip-1.6.10.ebuild 3673
 RMD160 cb97ee29e40405d1d9c2cddd523fedafb9a04f27 hplip-1.6.10.ebuild 3673
@@ -18,14 +19,18 @@ EBUILD hplip-1.7.4.ebuild 3395 RMD160 4f7ae55074ba5ec8b55647ced1fdbd4d36081705 S
 MD5 bc02960c59d9c4e56197e6f35696327b hplip-1.7.4.ebuild 3395
 RMD160 4f7ae55074ba5ec8b55647ced1fdbd4d36081705 hplip-1.7.4.ebuild 3395
 SHA256 6057ccabc25f6044fb97e573cb1b3e057606e852f26c252ced72caa3da0ec536 hplip-1.7.4.ebuild 3395
-MISC ChangeLog 10469 RMD160 17e23497018c8d0be8a5291b2fc3a9149076ca8a SHA1 6164e4d05ccc0e4dba66cf510cbbef354e3c1043 SHA256 648dc5eee4227f646d75fb337f5d5f5452a8e7c308f92b42a13c523c2a0e5eaa
-MD5 2cbce7929bac6ecee385a995cfe2e60c ChangeLog 10469
-RMD160 17e23497018c8d0be8a5291b2fc3a9149076ca8a ChangeLog 10469
-SHA256 648dc5eee4227f646d75fb337f5d5f5452a8e7c308f92b42a13c523c2a0e5eaa ChangeLog 10469
-MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
-SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
+EBUILD hplip-1.7.4a.ebuild 3590 RMD160 7bc45819b1b8738a072848911c83fc49ec0cf252 SHA1 40bbeff05b4a717d29c92e60eccad05c3a7c54e7 SHA256 8dc8a285b4fe5104ab12798b1ca8fa6db0f1a51e6bc7193325c3c7ee0949f6c4
+MD5 e26f7d0c8b10271f73428530f86a477d hplip-1.7.4a.ebuild 3590
+RMD160 7bc45819b1b8738a072848911c83fc49ec0cf252 hplip-1.7.4a.ebuild 3590
+SHA256 8dc8a285b4fe5104ab12798b1ca8fa6db0f1a51e6bc7193325c3c7ee0949f6c4 hplip-1.7.4a.ebuild 3590
+MISC ChangeLog 10661 RMD160 8a7151e07383053bb28ea5370d710b371d8bfc69 SHA1 5eb707c581941743dca4208a8cb5eb81dd155c0d SHA256 51802370a5ea5c5e4a627202e0e5d786e07999536ebf0d9e05dc2f06b3ad9330
+MD5 a76cf1fee4c77ad59cc5d6bdae6db12b ChangeLog 10661
+RMD160 8a7151e07383053bb28ea5370d710b371d8bfc69 ChangeLog 10661
+SHA256 51802370a5ea5c5e4a627202e0e5d786e07999536ebf0d9e05dc2f06b3ad9330 ChangeLog 10661
+MISC metadata.xml 250 RMD160 00f8254bd6b52bc050cdc822b7370b3e2d2f4970 SHA1 f91d1e6c01026cba252d042ba254f4a4bc61194a SHA256 ab106df12671f3f541e0416f8c0d5a96b6e725ed7b3b111d27af7a584c4bf164
+MD5 a7f39f5758507140c896dcc24a3e0e2f metadata.xml 250
+RMD160 00f8254bd6b52bc050cdc822b7370b3e2d2f4970 metadata.xml 250
+SHA256 ab106df12671f3f541e0416f8c0d5a96b6e725ed7b3b111d27af7a584c4bf164 metadata.xml 250
 MD5 2bbef9d8400c26b5a2bc15636d0db05b files/digest-hplip-1.6.10 521
 RMD160 fdbb47f4de10565f30fc32fcaa11d63def826a41 files/digest-hplip-1.6.10 521
 SHA256 a6a40ef739f13c2b5baf4d46161d709d65d1770a0bef40d472cd3161562c92ef files/digest-hplip-1.6.10 521
@@ -35,3 +40,6 @@ SHA256 8420503d0910c30234937e9e2c43469e80926d322130a88bdeb113cbff7be779 files/di
 MD5 9c9b65fd14b9deb4596758a9859783f1 files/digest-hplip-1.7.4 518
 RMD160 86901fa9a089a807505764fc917bfe60bf02ac74 files/digest-hplip-1.7.4 518
 SHA256 5c27411a7cb99880e1d58ef8d33d5f33bd7aff83fe442199ebd121e231df8d74 files/digest-hplip-1.7.4 518
+MD5 8cdad3401711a59d614863b839c45335 files/digest-hplip-1.7.4a 521
+RMD160 ac859e445b139c0789441184c5af69e1cb75d679 files/digest-hplip-1.7.4a 521
+SHA256 4d98dfc9fec72da07fc2405364c623aaed10c8476d582920a75639e8499cd135 files/digest-hplip-1.7.4a 521

diff --git a/net-print/hplip/files/digest-hplip-1.7.4a b/net-print/hplip/files/digest-hplip-1.7.4a
new file mode 100644 (file)
index 0000000..5fae59e
--- /dev/null
+++ b/net-print/hplip/files/digest-hplip-1.7.4a
@@ -0,0 +1,6 @@
+MD5 1c4b65222333d048450d37082d521b1e foomatic-db-hpijs-20060720.tar.gz 98252
+RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d foomatic-db-hpijs-20060720.tar.gz 98252
+SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e foomatic-db-hpijs-20060720.tar.gz 98252
+MD5 210e948d1f1f376426a2cca0ed9d1e6c hplip-1.7.4a.tar.gz 13566965
+RMD160 e2777b8b065abe385bfe557b9eed86848029e2c9 hplip-1.7.4a.tar.gz 13566965
+SHA256 903957b1b1aa86438d546a205a3d526a600b1e56754a5ba5ce99228a26cc475e hplip-1.7.4a.tar.gz 13566965

diff --git a/net-print/hplip/hplip-1.7.4a.ebuild b/net-print/hplip/hplip-1.7.4a.ebuild
new file mode 100644 (file)
index 0000000..ed6afc7
--- /dev/null
+++ b/net-print/hplip/hplip-1.7.4a.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-1.7.4a.ebuild,v 1.1 2007/04/27 06:58:42 calchan Exp $
+
+inherit eutils
+
+DB_V=20060720
+DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools."
+HOMEPAGE="http://hplip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+       foomaticdb? (
+               http://gentooexperimental.org/~genstef/dist/foomatic-db-hpijs-${DB_V}.tar.gz
+               http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-${DB_V}.tar.gz
+       )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cups fax foomaticdb parport ppds qt3 scanner snmp X"
+
+DEPEND="!net-print/hpijs
+       !net-print/hpoj
+       dev-libs/openssl
+       virtual/ghostscript
+       >=media-libs/jpeg-6b
+       net-print/cups
+       dev-libs/libusb
+       >=dev-lang/python-2.2
+       net-print/foomatic-filters
+       fax? ( >=dev-lang/python-2.3
+               dev-python/reportlab )
+       foomaticdb? ( net-print/foomatic-db-engine )
+       snmp? ( net-analyzer/net-snmp )
+       qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
+       scanner? (
+               >=media-gfx/sane-backends-1.0.9
+               X? ( || (
+                       >=media-gfx/xsane-0.89
+                       >=media-gfx/sane-frontends-1.0.9
+                       ) )
+               !X? ( || (
+                       >=media-gfx/sane-frontends-1.0.9
+                       >=media-gfx/xsane-0.89
+                       ) )
+       )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+       # avoid collisions with cups-1.2 compat symlinks
+       if [ -e ${ROOT}/usr/lib/cups/backend/hp ] && [ -e ${ROOT}/usr/libexec/cups/backend/hp ]; then
+               rm -f ${ROOT}/usr/libexec/cups/backend/hp{,fax};
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # bug 98428
+       sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" \
+               hpssd.py
+}
+src_compile() {
+       econf \
+               $(use_enable cups cups-install) \
+               $(use_enable fax fax-build) \
+               $(use_enable parport pp-build) \
+               $(use_enable ppds foomatic-install) \
+               $(use_enable qt3 gui-build) \
+               $(use_enable scanner scan-build) \
+               $(use_enable snmp network-build) \
+               || die "econf failed"
+       emake || die "emake failed"
+
+       if use foomaticdb ; then
+               cd ../foomatic-db-hpijs-${DB_V}
+               econf || die "econf failed"
+               rm -fR data-generators/hpijs-rss
+               emake || die "emake failed"
+       fi
+}
+
+
+src_install() {
+       # cups-1.2 installation paths, make sure that the .desktop is installed
+       sed -i -e "s:/usr/lib/cups:$(cups-config --serverbin):" \
+               -e 's:\(ICON_FILE = \).*:\1hplip.desktop:' \
+               -e 's:\(ICON_PATH = \).*:\1/usr/share/applications:' \
+               Makefile
+
+       emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+       newinitd "${FILESDIR}"/hplip.init.d hplip
+
+       if use scanner; then
+               dodir /usr/$(get_libdir)/sane
+               for i in libsane-hpaio.{la,so{,.1{,.0.0}}}; do
+                       dosym /usr/$(get_libdir)/${i} /usr/$(get_libdir)/sane/${i}; done
+       else
+               rm -f "${D}"/usr/$(get_libdir)/libsane-hpaio.{la,so{,.1{,.0.0}}}
+               rm -f "${D}"/etc/sane.d/dll.conf
+       fi
+
+       # bug 106035
+       if ! use qt3 ; then
+               rm -f "${D}"/usr/{bin/hp-,share/hplip/}{print,toolbox}
+               rm -f "${D}"/usr/share/applications/hplip.desktop
+               rm -f "${D}"/usr/lib/menu/hplip
+       fi
+
+       rm -rf ${D}/$(cups-config --serverbin)/filter ${D}/usr/bin/foomatic-rip
+
+       if use foomaticdb ; then
+               cd ../foomatic-db-hpijs-${DB_V}
+               emake DESTDIR="${D}" install || die "emake install failed"
+       fi
+}
+
+pkg_preinst() {
+       if use scanner; then
+               insinto /etc/sane.d
+               [ -e /etc/sane.d/dll.conf ] && cp /etc/sane.d/dll.conf .
+               [ -e ${ROOT}/etc/sane.d/dll.conf ] && cp ${ROOT}/etc/sane.d/dll.conf .
+               grep -q hpaio dll.conf || echo hpaio >> dll.conf
+               doins dll.conf
+       fi
+}
+
+pkg_postinst() {
+       if ! use qt3 ; then
+               elog "You need to enable the qt3 useflag to use the GUI"
+       fi
+}

diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index 1fa0ca569505b0e6d57b0f7c493f8c98cf93d766..3f0df6e37ab5ca89aeb5885c64f9d1486eb86c4a 100644 (file)
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>printing</herd>
+<maintainer>
+<email>calchan@gentoo.org</email>
+<name>Denis Dupeyron</name>
+</maintainer>
 </pkgmetadata>