diff options
author | Andreas Hüttel <dilfridge@gentoo.org> | 2012-01-18 21:01:33 +0000 |
---|---|---|
committer | Andreas Hüttel <dilfridge@gentoo.org> | 2012-01-18 21:01:33 +0000 |
commit | fddd22ab8c30c31e69d7413096fd3fd1ec86d3d5 (patch) | |
tree | 59a0847fa70e3a561a4bfc3da7f41f861f5bc08a /net-print/foo2zjs | |
parent | arm stable, bug #393007 (diff) | |
download | historical-fddd22ab8c30c31e69d7413096fd3fd1ec86d3d5.tar.gz historical-fddd22ab8c30c31e69d7413096fd3fd1ec86d3d5.tar.bz2 historical-fddd22ab8c30c31e69d7413096fd3fd1ec86d3d5.zip |
Various fixes so it builds and installs. Not sure if it works, though...
Package-Manager: portage-2.1.10.44/cvs/Linux x86_64
Diffstat (limited to 'net-print/foo2zjs')
-rw-r--r-- | net-print/foo2zjs/ChangeLog | 8 | ||||
-rw-r--r-- | net-print/foo2zjs/Manifest | 21 | ||||
-rw-r--r-- | net-print/foo2zjs/files/foo2zjs-udev.patch | 12 | ||||
-rw-r--r-- | net-print/foo2zjs/foo2zjs-99999999.ebuild | 13 |
4 files changed, 44 insertions, 10 deletions
diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog index 7283a59fd17e..c65405ee064b 100644 --- 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.46 2011/07/24 03:24:05 phajdan.jr Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/ChangeLog,v 1.47 2012/01/18 21:01:33 dilfridge Exp $ + + 18 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> + +files/foo2zjs-udev.patch, foo2zjs-99999999.ebuild: + Various fixes so it builds and installs. Not sure if it works, though... 24 Jul 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> foo2zjs-99999999.ebuild: Add app-editors/vim dependency for ex, bug #375397. diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest index a96975ba0d66..c8a4adc88ee2 100644 --- a/net-print/foo2zjs/Manifest +++ b/net-print/foo2zjs/Manifest @@ -1,13 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -EBUILD foo2zjs-99999999.ebuild 1444 RMD160 e44418398a24c86b31027b0f5b44acf2ebf10210 SHA1 c3cfe896a256075c6c01bbdf6509250b53aff940 SHA256 738bf816c286782d83b271baff586a847b3b5a8a7a520890a20d970661440686 -MISC ChangeLog 10340 RMD160 5a9356799243421c5acaca271c48372b92f1b23f SHA1 ef1b245b49f60952e4d5905590bb495b9f02c2e2 SHA256 751436fc9463bf31c4a9f81a56fefd43612ca27ed1751a94ed2b2f972e6b9bda +AUX foo2zjs-udev.patch 379 RMD160 316f2c916a39da42d350145900a6dd10a003cc80 SHA1 a7d441432c85794d4579e929edd406ea7c0c43c1 SHA256 8961b787e37daaec84d90a9e65a20782177f4483b80669f86e427de967035dfb +EBUILD foo2zjs-99999999.ebuild 1543 RMD160 9e8062f10ceefacad4240c0138deb46004c5cbde SHA1 76fb4c1bc409476ff1050912fd39317f6a14f2bc SHA256 9f0faf90009ec177ade680186b8a9f3c7eaf64497c78249b19d351dab103364f +MISC ChangeLog 10526 RMD160 2878880bc0b8eb1fb7c0152809523f20d1a6ef51 SHA1 db25830a081b31f98f734c867de85ca6d730e76f SHA256 9948e6145564c28dabb6d1b783c4edcad62a1d0b0cc285eeba856ff47b55d0ee MISC metadata.xml 163 RMD160 ba353b61c2868f08c1a5ab7fd17ba07e23803ada SHA1 2c739f5b77738ff409261fc42afe98d34184dd59 SHA256 594509291d2b412ff651880da503140d0e9a954ecf778878edabb1875682b6b8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREKAAYFAk4rkF8ACgkQuUQtlDBCeQJc6gCghZLk94x3ZmFCMJgWn1Tsd6wt -fjEAn2RlWmWObzfTiLiVyRHkfgSm2hPl -=GJO2 +iQIcBAEBCgAGBQJPFzNzAAoJENwGBM22xffeFRIQAIP1Vt2DsObGg0Y/zzp84BPD +XjnffVLw6eJ5XW9seWH0gw81dmlZF6s+08D2D62jfaxKDzpyh2qPyp2qonZIH7TK +6N3z9HCYQA0fv6BmE+SeGUTyDf7jQBhYp3iw56McjXO+JyhglxtaJWI+9/l3Kpp8 +icEYTFEXkIb6DJIJLpc4zp6UID14jebxOSlwvc9T+CWul38MwfEtgxXr1dmRgopu +CvAUiiSbCNZ7G5K2V29ITv0KLZjhhS10YGdFhGqHkOP7nJ+YeqrmyGdXbnDx/evC +FcpGBeC4nBXJtUVAGq/CscukkLnh38gdnKWTlbmRSd9ijeAiQZNY/SP3VcF2XUCH +0islehPX1xYVTUue2HuJbjKW4JJLNeeRCJpUP23+VwEDhd6NSrulV8ehToS0/nxi +ywAEEnP1xLgJTgwHXIsBFXxbEMJrsEcGHG2kdeZ3J5zUzq44sOQCNLgyVuEUlw9l +oTObG9jS6O2dZIEPnJgBKm3BeNu00xuNsgKXgXqwrAqn6T7VUK86wJUlKJAocgZ0 +F7QvMCIj4q7XOiM25ho1CP8Hf0uIs37WupH6JR5SS3HEoKoLx8Yd+IsTBI3GDaSC +DsaidVowghxdiqlEvIkuD0+zHFd90FFFqkNxZoRG/A/AJ+Z8ukFwHM6yNjr+eAt0 +PpORSCJSbCaKQ3AdUmUO +=TYup -----END PGP SIGNATURE----- diff --git a/net-print/foo2zjs/files/foo2zjs-udev.patch b/net-print/foo2zjs/files/foo2zjs-udev.patch new file mode 100644 index 000000000000..070383949a8d --- /dev/null +++ b/net-print/foo2zjs/files/foo2zjs-udev.patch @@ -0,0 +1,12 @@ +diff -ruN foo2zjs/Makefile foo2zjs.orig/Makefile +--- foo2zjs/Makefile 2012-01-18 21:53:45.834944820 +0100 ++++ foo2zjs.orig/Makefile 2012-01-18 21:51:18.872936603 +0100 +@@ -933,7 +933,7 @@ + echo " *** OR (generic linux)"; \ + echo " *** # rm -f $(LIBUDEVDIR)/*-printers.rules"; \ + echo " ***"; \ +- exit 1; \ ++ # exit 1; \ + fi + # ... OK! + # diff --git a/net-print/foo2zjs/foo2zjs-99999999.ebuild b/net-print/foo2zjs/foo2zjs-99999999.ebuild index ac45918cbdb2..176fc58b46f4 100644 --- a/net-print/foo2zjs/foo2zjs-99999999.ebuild +++ b/net-print/foo2zjs/foo2zjs-99999999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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.6 2011/07/24 03:24:05 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/foo2zjs/foo2zjs-99999999.ebuild,v 1.7 2012/01/18 21:01:33 dilfridge Exp $ EAPI="4" @@ -19,7 +19,8 @@ RESTRICT="bindist" RDEPEND="net-print/cups net-print/foomatic-db-engine net-print/foomatic-filters - sys-fs/udev" + sys-fs/udev + !!net-print/hplip" DEPEND="${RDEPEND} app-arch/unzip app-editors/vim @@ -35,6 +36,8 @@ src_unpack() { wget "http://foo2zjs.rkkda.com/${PN}.tar.gz" tar zxf "${WORKDIR}/${PN}.tar.gz" + epatch "${FILESDIR}/${PN}-udev.patch" + cd "${S}" einfo "Fetching additional files (firmware, etc)" @@ -56,6 +59,10 @@ src_prepare() { sed -e 's/ install-filter / /g' -i Makefile } +src_compile() { + MAKEOPTS=-j1 default +} + src_install() { # ppd files are installed automagically. We have to create a directory # for them. |