From ac8a066796ef598768c5a390cfd3ecf25b0ad765 Mon Sep 17 00:00:00 2001 From: Daniel Pielmeier Date: Sat, 4 Apr 2015 09:39:04 +0000 Subject: [PATCH] Remove old. This time the correct version. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x215AD14D --- net-print/hplip/ChangeLog | 5 +- net-print/hplip/Manifest | 11 +- net-print/hplip/hplip-3.14.1.ebuild | 267 ---------------------------- 3 files changed, 8 insertions(+), 275 deletions(-) delete mode 100644 net-print/hplip/hplip-3.14.1.ebuild diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog index 2b8328cbc932..30d75aa96e01 100644 --- a/net-print/hplip/ChangeLog +++ b/net-print/hplip/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-print/hplip # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.322 2015/04/04 09:35:38 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.323 2015/04/04 09:39:03 billie Exp $ + + 04 Apr 2015; Daniel Pielmeier -hplip-3.14.1.ebuild: + Remove old. This time the correct version. 04 Apr 2015; Daniel Pielmeier +hplip-3.14.10.ebuild: Restore latest stable version. Thanks to Andreas Prieß in bug #531312. diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest index c5116556d3af..92c7ff3b2487 100644 --- a/net-print/hplip/Manifest +++ b/net-print/hplip/Manifest @@ -1,20 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST hplip-3.13.11-patches-1.tar.xz 6280 SHA256 e1e301b01a94c6565d9acd4b868e1b69e7420a586addd9439529713a30d68100 SHA512 054b62bfde6f2b41894c0da2644aae8d8f592d14021fbf5e7eede9f0b3f6f1bea9b6a219c2807102bfa7c6c738565d9910e6fdefabd45eccd3c62c6313714595 WHIRLPOOL ec7102dfbced0886ca64c83743b90bd3fa8308510c71f56246ab47acd3cf4770e2e3538b84265a8d096869881c85c98f477207a8e802c763db57255236479ed9 -DIST hplip-3.14.1.tar.gz 21116532 SHA256 5c1e79d4426c00c3eb7ec9b689c430ea3d132e23849c08ae3dc58cd8d3d0eb14 SHA512 caeeda3e641dd2a15d272a20272c220a2ea7ecabde0fad3b579e9cf351a0f44de2b32e0dc5b2880c231e61eaacb9d8d19e8ecd3ff1945027412089a43fee2ca7 WHIRLPOOL 75caf28546f42f3f436c7eeb108f1cb8ce26f57ab9fb8b2ae64d9de4c1f03a71b28f281353ca6240ecaa2ff6918b926d749aad50f4ea50a5312a07292d30c216 DIST hplip-3.14.10-patches-1.tar.xz 8140 SHA256 33116a5e2c104495d60f0b15e923b2ae5eaaf269cd5ee8e988b035eb20aa23ab SHA512 a8deb03979c55b660ef299505afc328fc930786ea9d473109a9fafd83d72528a9c3700faf4742f2e05829824fc97c3656538e1a607e2191e617f3944f0482e9a WHIRLPOOL bbf5d62f29c0fb0162f34b7815fc190459c619fdaf4f96e33d085f9b7228fa5431b6d668322256995a0a1d16aa1cccb75171000bbb2334ad3b51fec47f2653c0 DIST hplip-3.14.10.tar.gz 21773429 SHA256 11b3cd8311dea6b22a4c80be1e5d021e84d15a5f3e7e22cbd43798e5c1a89598 SHA512 ed184c8d0d3d8d5aad454831013d7c5e0b1685b088ee8099b6efc1b152f8b159a2349f23f0c5c77a7a5f1a48165b0e22f2ff83ced1beb14633bd278d4ef4d6dc WHIRLPOOL 8e1985cfd370849db96765f792655da36e22b6cecb660dd4707b0ff33dd53c8b66b2ec73a9596c7e60036edc1843c195bbbde64f37c5a1c319752bf0ebc08eb6 DIST hplip-3.15.2.tar.gz 21793148 SHA256 5f02eca743d85240db07ed2fc6551e1dce0dedc85ad4a0e90417e4d5b630f67c SHA512 d06352080593e7d376c9d540b10911e55f7458d35f64daef4d12b921d58e080ee984a0391ad61c6c26147ecdfbb304b96e234ef27ed960e838f91f59d3a335a2 WHIRLPOOL 6b736279a73e67a53a67afc560b1d4c543a561698396092b44072954345904f3303c29f393ed932dfea05a510abdb6cda8006051705e02f517b80991cf7a9514 -EBUILD hplip-3.14.1.ebuild 7958 SHA256 2e1a904ac41bd36f99ebdde2dab0f0b1dc1a798a505f4908fe90c6ddcd17b07b SHA512 17a7ac245b08a0afe75d4f899ddadde4cc06aea2f9c8fdd167ccf5d0d6f657bc57527adccf4661edaa7ddd268c2752592a9bf4943ab9e4be335fdd603ab00b21 WHIRLPOOL b8ae428af39333f2e86cdf3d0be53ca6dbf385f115a5670db852fa60ea029f8ab8d9ffa711c25ade26dbd926a1131680ee312992af585baa25fcd19e958d8ee0 EBUILD hplip-3.14.10.ebuild 7907 SHA256 4ba6773b226c5e10d1a2f4f06bff5e97f3ce5a769f1d338a9d0b9f6ea065a5b2 SHA512 184c0d639a0dcdeb92bba599057580c7ebfd12190ad0b716bf529871e8502d3eb3eba3e935a3af2900455ef0138fc1fc866a57727a681f6caf778e69030befaa WHIRLPOOL 065456a42ac8be192426ef6c6e400e1cb93373365e9a74ad9bc1ea9fef3496ffd4d558be86041cad9cccec38f78529084c7f2a17827fa88e37e15fdb4bfcbad8 EBUILD hplip-3.15.2.ebuild 7708 SHA256 97874a97a04f2d713ed39db302106b4a6cbf4231b40491a59eef3b884e251c86 SHA512 51baf3af5179df0044365fbf3b5f926301d72b74ef8e174163830fb94b5898e3b866fbd4dd6ddbf422d2349fadfea16d6aafdfa63e68d9e59edf4984b304ab8a WHIRLPOOL 9dc9856bf59275479a2daa1bca28924e39629def51787f3d382d30b2bd3f7719ec9e7188f2dc569ec802737e87e3debe8965caf71c4020bc622e1a35aca12c7a -MISC ChangeLog 53979 SHA256 e11e08eebc06cad4bcbe87b639e97bae366187828cc8da1e290d565f3439d911 SHA512 4f9ecfa398a060c9d4171fd255f0aa01d662bb394102ad19bd3bdc231aa0629580a19d23490a41b8ccfc2919c4a33f1ed7ee21bf1df6aa391871f4cfd2849f1b WHIRLPOOL 362fa2964ded809bb59e5278a52323cbfcb1b9ea4f6ee527a705598d4a60ef4ebd65d5c925538e914d066a1c56e6e338d02f19e78dc5f964150e41cf6c00ea94 +MISC ChangeLog 54099 SHA256 b2b751252965e9b9b8624cfd8fb973a514578b7ce46cb4c87cbf533ac51cc0a8 SHA512 5dfe5d0047e8fe3ea97911764c50d2f986bf5b8a31185e275e85ead7bddcb4b148fca39ba801cb32f2d5c3066b835fd074905e6ff5515ab3729ced5917f9d715 WHIRLPOOL df21e2ed37bfceb67d318138b2189a3d955c6f33d257e762dc7468e59fa79bee8cea037085ea3f4e0bb641dc89fd3ff2481943bf4cfa4413498f3caeaf88f859 MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlUfsHAACgkQlcuUeyFa0U0HBACg+ECa/YhcTmWZJNseA6Ecdk4W -B90AoOUeIdWaDyLYooVip5owRQbXyk5d -=eX+6 +iEYEAREIAAYFAlUfsTcACgkQlcuUeyFa0U39wACgjtNQ/UYkwrm+yyiiWtNvbBiS +lTgAoIlxZVJ1EalIjxZmbkfUh/A1Sxrk +=Qj6d -----END PGP SIGNATURE----- diff --git a/net-print/hplip/hplip-3.14.1.ebuild b/net-print/hplip/hplip-3.14.1.ebuild deleted file mode 100644 index dfdd9113d649..000000000000 --- a/net-print/hplip/hplip-3.14.1.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.14.1.ebuild,v 1.12 2015/01/30 12:48:55 billie Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads,xml" - -inherit eutils fdo-mime linux-info python-single-r1 udev autotools toolchain-funcs - -DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools" -HOMEPAGE="http://hplipopensource.com/hplip-web/index.html" -SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz - http://dev.gentoo.org/~billie/distfiles/${PN}-3.13.11-patches-1.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86" - -# zeroconf does not work properly with >=cups-1.4. -# Thus support for it is also disabled in hplip. -IUSE="doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X" - -# TODO: check if net-print/cups, net-analyzer/net-snmp -# are migrated to python-r1 - -COMMON_DEPEND=" - virtual/jpeg:0 - hpijs? ( - || ( >=net-print/cups-filters-1.0.43-r1[foomatic] >=net-print/foomatic-filters-3.0.20080507[cups] ) - ) - !minimal? ( - ${PYTHON_DEPS} - >=net-print/cups-1.4.0 - !libusb0? ( virtual/libusb:1 ) - libusb0? ( virtual/libusb:0 ) - scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) - fax? ( >=sys-apps/dbus-1.6.8-r1 ) - snmp? ( - net-analyzer/net-snmp - dev-libs/openssl:0 - ) - )" - -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" - -RDEPEND="${COMMON_DEPEND} - >=app-text/ghostscript-gpl-8.71-r3 - >=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}] - policykit? ( - sys-auth/polkit - ) - !minimal? ( - >=dev-python/pygobject-2.28.6-r53:2[${PYTHON_USEDEP}] - kernel_linux? ( virtual/udev !=dev-python/reportlab-2.6[${PYTHON_USEDEP}] - >=virtual/python-imaging-1[${PYTHON_USEDEP}] - X? ( || ( - kde? ( kde-misc/skanlite ) - media-gfx/xsane - media-gfx/sane-frontends - ) ) - ) - fax? ( - >=dev-python/reportlab-2.6[${PYTHON_USEDEP}] - >=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}] - ) - qt4? ( - >=dev-python/PyQt4-4.9.6-r2[dbus,X,${PYTHON_USEDEP}] - libnotify? ( - >=dev-python/notify-python-0.1.1-r3[${PYTHON_USEDEP}] - ) - ) - )" - -REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )" - -CONFIG_CHECK="~PARPORT ~PPDEV" -ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)." - -pkg_setup() { - use !minimal && python-single-r1_pkg_setup - - ! use qt4 && ewarn "You need USE=qt4 for the hplip GUI." - - use scanner && ! use X && ewarn "You need USE=X for the scanner GUI." - - if ! use hpcups && ! use hpijs ; then - ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver," - ewarn "which is probably not what you want." - ewarn "You will almost certainly not be able to print." - fi - - if use minimal ; then - ewarn "Installing driver portions only, make sure you know what you are doing." - ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver" - ewarn "is installed. If both USE flags are set hpijs overrides hpcups." - else - use parport && linux-info_pkg_setup - fi -} - -src_prepare() { - if use !minimal ; then - python_export EPYTHON PYTHON - python_fix_shebang . - fi - - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}" - - # Make desktop files follow the specification - # Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680 - # Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324 - sed -i -e '/^Categories=/s/Application;//' \ - -e '/^Encoding=.*/d' hplip.desktop.in || die - sed -i -e '/^Categories=/s/Application;//' \ - -e '/^Version=.*/d' \ - -e '/^Comment=.*/d' hplip-systray.desktop.in || die - - # Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725 - # Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847, - # https://bugs.launchpad.net/hplip/+bug/500086 - local udevdir=$(get_udevdir) - sed -i -e "s|/etc/udev|${udevdir}|g" \ - $(find . -type f -exec grep -l /etc/udev {} +) || die - - # Force recognition of Gentoo distro by hp-check - sed -i \ - -e "s:file('/etc/issue', 'r').read():'Gentoo':" \ - installer/core_install.py || die - - # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip - # The hpcups driver does not use foomatic-rip - local i - for i in ppd/hpijs/*.ppd.gz ; do - rm -f ${i}.temp || die - gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ - gzip > ${i}.temp || die - mv ${i}.temp ${i} || die - done - - eautoreconf -} - -src_configure() { - local myconf drv_build minimal_build - - if use fax || use qt4 ; then - myconf="${myconf} --enable-dbus-build" - else - myconf="${myconf} --disable-dbus-build" - fi - - if use libusb0 ; then - myconf="${myconf} --enable-libusb01_build" - else - myconf="${myconf} --disable-libusb01_build" - fi - - if use hpcups ; then - drv_build="$(use_enable hpcups hpcups-install)" - if use static-ppds ; then - drv_build="${drv_build} --enable-cups-ppd-install" - drv_build="${drv_build} --disable-cups-drv-install" - else - drv_build="${drv_build} --enable-cups-drv-install" - drv_build="${drv_build} --disable-cups-ppd-install" - fi - else - drv_build="--disable-hpcups-install" - drv_build="${drv_build} --disable-cups-drv-install" - drv_build="${drv_build} --disable-cups-ppd-install" - fi - - if use hpijs ; then - drv_build="${drv_build} $(use_enable hpijs hpijs-install)" - if use static-ppds ; then - drv_build="${drv_build} --enable-foomatic-ppd-install" - drv_build="${drv_build} --disable-foomatic-drv-install" - else - drv_build="${drv_build} --enable-foomatic-drv-install" - drv_build="${drv_build} --disable-foomatic-ppd-install" - fi - else - drv_build="${drv_build} --disable-hpijs-install" - drv_build="${drv_build} --disable-foomatic-drv-install" - drv_build="${drv_build} --disable-foomatic-ppd-install" - fi - - if use minimal ; then - if use hpijs ; then - minimal_build="--enable-hpijs-only-build" - else - minimal_build="--disable-hpijs-only-build" - fi - if use hpcups ; then - minimal_build="${minimal_build} --enable-hpcups-only-build" - else - minimal_build="${minimal_build} --disable-hpcups-only-build" - fi - fi - - econf \ - --disable-cups11-build \ - --disable-lite-build \ - --disable-foomatic-rip-hplip-install \ - --disable-shadow-build \ - --disable-qt3 \ - --disable-udev_sysfs_rules \ - --disable-udev-acl-rules \ - --with-cupsbackenddir=$(cups-config --serverbin)/backend \ - --with-cupsfilterdir=$(cups-config --serverbin)/filter \ - --with-docdir=/usr/share/doc/${PF} \ - --with-htmldir=/usr/share/doc/${PF}/html \ - ${myconf} \ - ${drv_build} \ - ${minimal_build} \ - $(use_enable doc doc-build) \ - $(use_enable fax fax-build) \ - $(use_enable parport pp-build) \ - $(use_enable scanner scan-build) \ - $(use_enable snmp network-build) \ - $(use_enable qt4 gui-build) \ - $(use_enable qt4) \ - $(use_enable policykit) -} - -src_install() { - default - - # Installed by sane-backends - # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023 - rm -f "${D}"/etc/sane.d/dll.conf || die - - rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die - rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die - - # Remove hal fdi files - rm -rf "${D}"/usr/share/hal || die - - find "${D}" -name '*.la' -exec rm -rf {} + || die - - if use !minimal ; then - python_export EPYTHON PYTHON - python_optimize "${D}"/usr/share/hplip - fi -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "For more information on setting up your printer please take" - elog "a look at the hplip section of the gentoo printing guide:" - elog "https://wiki.gentoo.org/wiki/Printing" - elog - elog "Any user who wants to print must be in the lp group." - elog - elog "Please note: Printers requiring a binary plugin are currently" - elog "not supported. All bugs regarding the plugin are most likely" - elog "closed. A bug about including the plugin package to gentoo is" - elog "available here: https://bugs.gentoo.org/352439" - fi -} -- 2.26.2