diff options
author | Nathan Phillip Brink <binki@gentoo.org> | 2012-03-10 15:53:55 +0000 |
---|---|---|
committer | Nathan Phillip Brink <binki@gentoo.org> | 2012-03-10 15:53:55 +0000 |
commit | 5db1a4c8f02f1864b4a10e344e6f6af1c5808032 (patch) | |
tree | 0407012d72fe23384d8c96b654f5a80c143516e2 /net-print | |
parent | Moving dev-php/yaml to dev-php/YAML (diff) | |
download | historical-5db1a4c8f02f1864b4a10e344e6f6af1c5808032.tar.gz historical-5db1a4c8f02f1864b4a10e344e6f6af1c5808032.tar.bz2 historical-5db1a4c8f02f1864b4a10e344e6f6af1c5808032.zip |
Bump to c2esp-24 for bug #406505 by Navid Zamani. Fix docdir and respect CPPFLAGS in the new version.
Package-Manager: portage-2.2.0_alpha90-r1/cvs/Linux x86_64
Diffstat (limited to 'net-print')
-rw-r--r-- | net-print/c2esp/ChangeLog | 11 | ||||
-rw-r--r-- | net-print/c2esp/Manifest | 33 | ||||
-rw-r--r-- | net-print/c2esp/c2esp-24.ebuild | 53 | ||||
-rw-r--r-- | net-print/c2esp/files/c2esp-24-ldflags-cppflags.patch | 32 |
4 files changed, 112 insertions, 17 deletions
diff --git a/net-print/c2esp/ChangeLog b/net-print/c2esp/ChangeLog index d2c3cd9760e2..6e663e46096c 100644 --- a/net-print/c2esp/ChangeLog +++ b/net-print/c2esp/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-print/c2esp -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/c2esp/ChangeLog,v 1.1 2011/08/23 03:59:00 binki Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/c2esp/ChangeLog,v 1.2 2012/03/10 15:53:54 binki Exp $ + +*c2esp-24 (10 Mar 2012) + + 10 Mar 2012; Nathan Phillip Brink <binki@gentoo.org> +c2esp-24.ebuild, + +files/c2esp-24-ldflags-cppflags.patch: + Bump to c2esp-24 for bug #406505 by Navid Zamani. Fix docdir and respect + CPPFLAGS in the new version. *c2esp-18 (23 Aug 2011) diff --git a/net-print/c2esp/Manifest b/net-print/c2esp/Manifest index 022c8b8195a5..49c057f723aa 100644 --- a/net-print/c2esp/Manifest +++ b/net-print/c2esp/Manifest @@ -1,25 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX c2esp-18-ldflags.patch 1497 RMD160 cbb1feab09874be02109bd3d5742296994bbcdfc SHA1 2c89340a36b527abe58d49f50b8343b00589345e SHA256 23335490f884ea82ac726df99db6bd53f794d865c3fbe0934ef35c0e173ae200 +AUX c2esp-24-ldflags-cppflags.patch 1039 RMD160 4ebe2c9b29fd0339e40c63f2b3c5013ee85517f1 SHA1 be6503518cee8d20010beb8398ff9fe772ee0a10 SHA256 6ef278119a9d1655f09a42f48fa0894ba9455212b99d6394abd2f45d8b029322 DIST c2esp18.tar.gz 94854 RMD160 27ef332ec6d269151fa5f2d4e8e80a4d6025444a SHA1 f72706342be82ea8747b163625fb6888249f197f SHA256 1503a30e3dcc0fe58bc4f52b0b6029dafcc7339e09660893076b79d69fc8c15e +DIST c2esp24.tar.gz 118656 RMD160 305875126f44cf5c4f767f22fb3401ad8acfb1de SHA1 0cbcd0e548506da94853c321ab564b41148d98fd SHA256 ca9824f7959ad894ffb112eb8039739153a331bc71ca3f7b30134de85e27b6e7 EBUILD c2esp-18.ebuild 1148 RMD160 6fc1379aadaa60b08ef29d18937b8766957061fa SHA1 a2daeeaa388c1732f19aa6f4e934e4026bdced7c SHA256 8703fccd20494448d72526b17d2ec348cde1bdf6fe213f13b9314488530af469 -MISC ChangeLog 413 RMD160 dbafb8eb0e3b41aa39cc7b19f9f095d0fade9c2d SHA1 f5eb6b89e64ab793382a83e9dba72a409cfbe17d SHA256 7281cae6713a0ee74fb2f73fed527ceaf01411cc1137358b45c9a2446c1a86a2 +EBUILD c2esp-24.ebuild 1260 RMD160 b7991cb4d912c7530dd987612c98a0067b1cc97b SHA1 3013591f17b52ce24d5cc8f66a7b936e0363c201 SHA256 c0fc0d2280a36301c9f669dcafa4c322b8a8d08d84d48070341be38a042873df +MISC ChangeLog 660 RMD160 3c6e5e4a8751381aca9baa2c4fbd2647dae9bd2f SHA1 f26a9f87b3c2c173ff51d041fb7c03c5d907c32f SHA256 c9bac8f2d8236ce2f1db549b5360e1af8928b616e26ee42be67ac93ee2913310 MISC metadata.xml 268 RMD160 2d0bb43e83624ddfe747a2039aa62ca6055e7f99 SHA1 52ae921bc4a4ceed4687e29ac3f67dcc0ac91376 SHA256 288c33a2f3360fb312a69164b4f5ef4dfa9234a5e790de319f00ebebbcbd6331 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iQIcBAEBCAAGBQJOUyYsAAoJEHQ6UuhrqBBQ7Q0P/0tITnyIU/XDsC3Yv+6tWygz -uHCbjaqmdXi7SQYHCCKW7VidrXh+Gfit2eiuFRYGYRtMz41VsGX3vAtqSVDO0MBg -V5R7dcvX2FNqa1vSpUYGScFOvnyk12nhNTSdpLn7Yh2cTCB4AKjmjQGNdqRdJoB1 -XINQfx6tp1sPGQ4BmJfatb/22eC0wUOTxQIIR5/gz7p4Zx7EL97sLkoaVfI154fd -m02pnxLmBambI1r3BzSg4iSI/t5kvC0s7y8BkK3TdqtY95L6zL7Vvfc2DY/rPvdO -2SZDMUicCYE1e+Gn/HsMyepLWKJjBEQwmnQeLh8CfHi3CoBPmqM98NKSDtH6nfNI -m7TNRGcHt4KLHiFdWaYgX5/aySgI6AM8Qa52paKI19The5FrPYc06hbQ5EDEbUvX -tVr72i256EuwMvXe06u9SLCowx+7lTHT5F40oSsndO66hh04MzCOXS3K0Y2pyDy1 -gxKdqfhSDAlLf/H1rmE06Rqb1v4BH3YDAqD9VQVs5BZGLaaiggnrOJZUPdYDzRwT -OWaXlLLB3nst+JGt0hvtv3ZlkHFQT7ILMqvXUe5IRdW2jNvWoJHMy4sgH+Aets4d -g8s8WIv43YJIpkL2KyCfj9fexsG8AFlaln5vW23FEPea01zJxmEjIXil4zXOl4H7 -+DPJv1lO5gn94KmGeaMr -=sids +iQIcBAEBCgAGBQJPW3kaAAoJEHQ6UuhrqBBQNfcP/ijuSWWe5aIgV5H5djIQBbbn +ejEgRLMm/h/WHRvxj6l5KnFZZHSPrRsEXEpoJiNpbw4NFUMKzZ9ZYS4XL/sdeO4n +Mi23cYcv9MzisBOYp+BRFUzxqvBuGoWEANxV6L1QBdlNK5ww3Hyz7t9wA6YqhtLx +CMrNz/dbMbF0aioJEDS4d4uHItBDAMkiwspbDBw3UhOFss4b7UzrZXm1IajIaFhW +TUL5FAy3iI9uU9o19T77ruQYUehA6etIZeUZ51CjPc3n+CPV5ls7C3+Lt6geH3YJ +mG23LWNZ2WtuhzwIWuHVW86e5mZkdeVjD+vVkTCwVbGzi9F1QYuD1CoN29GvbIZR +kS7/VYxy2O39Xk9iV/2rUNLnxXF6RzDhj5eAOHHz3b6NR2XEoeSGtihqbPWT9Hyh +Gbp2so3mfmX0QvMbfswNyRGxqC00ZFM+xK+crdGwTWbP7HTfmPuPw0g7nFFl6Whm +jB1UnhpLkhw/rro4lfvlO1NsT8/U0OoSUpfkF/b7YKzHHoxdo2H3jsJwjArtsiMN +iQL5jFKToCZ+Y76VtzqsPG9pTMPackI4kfhB+1k6DdMW0urg/7Sku2SWQ6tgxR0Q +V42xybpTWny13hmmD1Rs8xdYyZj2evmwsj6xopI4vZIGYSzAes+hFgzV7y0hyX0u +lztoaudMTlrai4jPOzpY +=AgSs -----END PGP SIGNATURE----- diff --git a/net-print/c2esp/c2esp-24.ebuild b/net-print/c2esp/c2esp-24.ebuild new file mode 100644 index 000000000000..6a64f5f9cee5 --- /dev/null +++ b/net-print/c2esp/c2esp-24.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/c2esp/c2esp-24.ebuild,v 1.1 2012/03/10 15:53:54 binki Exp $ + +EAPI=4 + +inherit eutils toolchain-funcs + +MY_P=${PN}${PV} + +DESCRIPTION="A cups filter for Kodak ESP printers" +HOMEPAGE="http://cupsdriverkodak.sf.net/" +SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${MY_P}.tar.gz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +S=${WORKDIR}/${MY_P} + +DEPEND=">=media-libs/jbigkit-2.0-r1 + >=net-print/cups-1.4" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-ldflags-cppflags.patch + + # Remove embedded media-libs/jbigkit + rm -f *jbig* || die + + # Remove the embedded jbig files from the Makefile's dependencies: + sed -i \ + -e '/^[a-z0-9.]*:/s/\$(LIBJBG[[:digit:]]*)//g' \ + -e '/^[a-z0-9.]*:/s/jbig[^ ]*\.h//g' \ + -e '/\$(INSTALL).*COPYING/d' \ + Makefile || die + + # Use Gentoo-style cups paths + sed -i -e s,/usr/lib/cups/filter,/usr/libexec/cups/filter,g ppd/*.ppd || die +} + +src_compile() { + emake CC="$(tc-getCC)" LIBJBG=-ljbig LIBJBG85=-ljbig85 +} + +src_install() { + emake \ + DESTDIR="${D}" \ + FILTERBIN="${D}"/usr/libexec/cups/filter \ + DOCDIR="${ED}"/usr/share/doc/${PF} \ + install +} diff --git a/net-print/c2esp/files/c2esp-24-ldflags-cppflags.patch b/net-print/c2esp/files/c2esp-24-ldflags-cppflags.patch new file mode 100644 index 000000000000..f1059c465330 --- /dev/null +++ b/net-print/c2esp/files/c2esp-24-ldflags-cppflags.patch @@ -0,0 +1,32 @@ +--- a/Makefile ++++ b/Makefile +@@ -166,16 +166,16 @@ + @echo + + c2esp: c2esp.o c2espcommon.o $(LIBJBG85) +- $(CC) $(CFLAGS) -o $@ c2esp.o c2espcommon.o -lcupsimage -lcups -lcupsdriver $(LIBJBG85) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2esp.o c2espcommon.o -lcupsimage -lcups -lcupsdriver $(LIBJBG85) + + c2espC: c2espC.o c2espcommon.o +- $(CC) $(CFLAGS) -o $@ c2espC.o c2espcommon.o -lcupsimage -lcups -lcupsdriver -lz ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2espC.o c2espcommon.o -lcupsimage -lcups -lcupsdriver -lz + + command2esp: command2esp.o c2espcommon.o +- $(CC) $(CFLAGS) -o $@ command2esp.o c2espcommon.o -lcups -lcupsdriver ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ command2esp.o c2espcommon.o -lcups -lcupsdriver + + myopldecode: myopldecode.o $(LIBJBG) +- $(CC) $(CFLAGS) -o $@ $@.o $(LIBJBG) -lz ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(LIBJBG) -lz + + # + # Installation rules +@@ -326,3 +326,8 @@ + # + ppdc KodakESP_10.drv + ppdc KodakESP_C_06.drv ++ ++# Respect CPPFLAGS. ++.SUFFIXES: .c .o ++.c.o: ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) -o '$@' '$<' |