Add install-hotplug to src_install, and other installation fixes; bug #375397 by...

Package-Manager: portage-2.1.10.3/cvs/Linux i686

diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog
index 8a012c4d8166870ebf664ef606bfe8336dd9f8d9..968807791fdcfc2677fa0572b30215bca8377418 100644 (file)
--- a/net-print/foo2zjs/ChangeLog
+++ b/net-print/foo2zjs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/foo2zjs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.44 2011/07/23 22:04:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.45 2011/07/23 22:37:59 phajdan.jr Exp $
+
+  23 Jul 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> foo2zjs-99999999.ebuild:
+  Add install-hotplug to src_install, and other installation fixes; bug #375397
+  by Dimitrije Zivkovic.
 
   23 Jul 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> foo2zjs-99999999.ebuild:
   Add sys-process/time dependency for tests.

diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index 29b7e12d4bb88f1aa6514395c7cd0e6992b60357..2959d91bbc5f98241464c2f2a24c4f6488092915 100644 (file)
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-EBUILD foo2zjs-99999999.ebuild 1281 RMD160 8b3cb845d69092b13a6fc5bafbfb6af87095e665 SHA1 3d604e273da644eb91b8557a618b3e4a4df7edfe SHA256 dfaab0f574368a62730c49df292c9da5902c18a0877217dcba14405bb5f9f9e5
-MISC ChangeLog 10019 RMD160 e902e5870d4bacfcb749fab8ce2062c9f681baff SHA1 8d67ae29be804fbc4b160408fd83ad1bbe254d96 SHA256 7bea1d4fb5e5a9b0604fc32835cd1ef42777a4db6030bb525904b78f54a3973d
+EBUILD foo2zjs-99999999.ebuild 1427 RMD160 be663ebceecf30d17c5f7020521f2a95d235082c SHA1 563c45171767396b219ff2f4ff0051a5065f4da5 SHA256 ca02b328af86db48797e87fd25bd78fb0e0b219ad88a4d887dde5be8cb4b7ceb
+MISC ChangeLog 10205 RMD160 650c2c751c74a26355421095c850b1fcf54cee6e SHA1 3748f731a0bb84ec50b8ff06982f59d5563305e9 SHA256 1f6eb571a89cf389f4d3a6fb402d1381fff654b42558a41159ee9363307e1dca
 MISC metadata.xml 163 RMD160 ba353b61c2868f08c1a5ab7fd17ba07e23803ada SHA1 2c739f5b77738ff409261fc42afe98d34184dd59 SHA256 594509291d2b412ff651880da503140d0e9a954ecf778878edabb1875682b6b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk4rRX8ACgkQuUQtlDBCeQKfDACfYPdyJuamA6Y8OoquOkv6zktw
-HCwAn05pi2yyzaXQvfVizEQwsAg36mEx
-=pw+N
+iEYEAREKAAYFAk4rTVEACgkQuUQtlDBCeQL5PQCcCsdug0ToiDA0QVcXS8QZofPc
+g7IAnRGOezdf4WhB3qN4Ewhnkb/xy85s
+=20Mc
 -----END PGP SIGNATURE-----

diff --git a/net-print/foo2zjs/foo2zjs-99999999.ebuild b/net-print/foo2zjs/foo2zjs-99999999.ebuild
index 530c45ba11edfffcc417cae54125925bdde78f5e..98ebf15c28ab1bc87576ae8fc2d40d1ac5ff12fe 100644 (file)
--- a/net-print/foo2zjs/foo2zjs-99999999.ebuild
+++ b/net-print/foo2zjs/foo2zjs-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-99999999.ebuild,v 1.4 2011/07/23 22:04:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-99999999.ebuild,v 1.5 2011/07/23 22:37:59 phajdan.jr Exp $
 
 EAPI="4"
 
@@ -23,6 +23,7 @@ RDEPEND="net-print/cups
 DEPEND="${RDEPEND}
        app-arch/unzip
        net-misc/wget
+       sys-apps/ed
        sys-devel/bc
        test? ( sys-process/time )"
 
@@ -45,6 +46,10 @@ src_unpack() {
 }
 
 src_prepare() {
+       # Prevent an access violation.
+       sed -e "s~/etc~${D}/etc~g" -i Makefile
+       sed -e "s~/etc~${D}/etc~g" -i hplj1000
+
        # Prevent an access violation, do not create symlinks on live file system
        # during installation.
        sed -e 's/ install-filter / /g' -i Makefile
@@ -55,5 +60,5 @@ src_install() {
        # for them.
        mkdir -p "${D}/usr/share/ppd"
 
-       emake DESTDIR="${D}" install
+       emake DESTDIR="${D}" -j1 install install-hotplug
 }