diff options
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/Manifest | 23 | ||||
| -rw-r--r-- | net-print/cups/cups-1.1.23-r7.ebuild | 3 | ||||
| -rw-r--r-- | net-print/cups/files/cups-1.1.23-respectldflags.patch | 80 |
4 files changed, 100 insertions, 12 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 523d7752dca8..cca21a451282 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/cups # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.159 2006/02/07 03:03:12 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.160 2006/03/18 21:10:59 flameeyes Exp $ + + 18 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/cups-1.1.23-respectldflags.patch, cups-1.1.23-r7.ebuild: + Add patch to respect LDFLAGS while building shared libraries. 07 Feb 2006; Aron Griffis <agriffis@gentoo.org> cups-1.1.23-r7.ebuild: Mark 1.1.23-r7 stable on alpha diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 6d26e4dc9723..a69217d8a483 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -1,24 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 11be9db8e3c650f66823510638e6708a ChangeLog 21038 -RMD160 26b9ceb480b29eb73db4ef4c7ce5ace11429ba9b ChangeLog 21038 -SHA256 cec46cb0db9cb06d3a5a8827688931288580716d156ad234aed4bf920394e8d9 ChangeLog 21038 +MD5 5c67774085176d05eb194e3fa552c981 ChangeLog 21223 +RMD160 d46be6e684fd8411376dd6f8b15d4d1cc639e19e ChangeLog 21223 +SHA256 4a551871a1985ac58b1e8ec0323d733df3f32a155013270d9f7252086f76a532 ChangeLog 21223 MD5 b92beaae46fa3940593e9915f4feb8f0 cups-1.1.23-r1.ebuild 4130 RMD160 d2b38e6f29d8f6a9cd0a4753d945d120ab8c4dbd cups-1.1.23-r1.ebuild 4130 SHA256 f7eea788f7fab983696ddf7d68f33dc6cc542ae9a7d50658c1195202cfe90fb5 cups-1.1.23-r1.ebuild 4130 MD5 2cb2b2e2a87d4e2bc1a2419508c76b2c cups-1.1.23-r4.ebuild 4367 RMD160 f0d6ed7b6c7566155fe7d66809d1bce69e87f5cc cups-1.1.23-r4.ebuild 4367 SHA256 0ac1c336d55d768457909e4e59da0abcec89987bdcfe08be1876870362016ae3 cups-1.1.23-r4.ebuild 4367 -MD5 4dd4e4b0f51519b01afac8175cf5e237 cups-1.1.23-r7.ebuild 4552 -RMD160 c5d85ebad6c4db4c802cf3cd748110c3997b704e cups-1.1.23-r7.ebuild 4552 -SHA256 8cd60058433e4c255ae80d4f5b407be8086273452cd6eaa0184870fea991f64b cups-1.1.23-r7.ebuild 4552 +MD5 0290694239f13517dae103c325d4ec7e cups-1.1.23-r7.ebuild 4599 +RMD160 c935b183641c5c661152d6603596a6fa18bea7bc cups-1.1.23-r7.ebuild 4599 +SHA256 7141f06b13482527f29aaebdb3a0a17b35dda551de3bca4af7c887f987da609d cups-1.1.23-r7.ebuild 4599 MD5 85bc20d893f097ef0f13947179c3838c files/cups-1.1.22-xpdf2-underflow.patch 2301 RMD160 d8f9f74f97ff380ee0552ab2e1f5499af99ee829 files/cups-1.1.22-xpdf2-underflow.patch 2301 SHA256 b400d696742a95040bf6734fca01f5b49481d3610dd5cf6b63786bd1f35e1dd6 files/cups-1.1.22-xpdf2-underflow.patch 2301 MD5 b22c12cb42113ddc40988cfbe93e3519 files/cups-1.1.23-bindnow.patch 2087 RMD160 35c18c1bbeb7c79f9207ecbd69c004f2ddf68f80 files/cups-1.1.23-bindnow.patch 2087 SHA256 fb932b7e9d04dfe7d52bd455f3514818a3bba1eaa3a3342b5c6b840bf957e67b files/cups-1.1.23-bindnow.patch 2087 +MD5 14726f87ced90b9e00ec6a5026bb901d files/cups-1.1.23-respectldflags.patch 2922 +RMD160 a2c9ca06844306556593e6de49b8511c14e99984 files/cups-1.1.23-respectldflags.patch 2922 +SHA256 590c8541029fee3aedd85f2b960300f2383d003d73557b83224c21f760f319c1 files/cups-1.1.23-respectldflags.patch 2922 MD5 7888ddf6a0c4cfb38b8882651e22d66c files/cups-gcc4-amd64.patch 566 RMD160 12372ca22d689df7f3129d43ba1b7e6c9161868b files/cups-gcc4-amd64.patch 566 SHA256 e5d7cfb3a96731362008ff7e103cb3156059b0b86031564cc0a3e4bf9ea334fa files/cups-gcc4-amd64.patch 566 @@ -65,9 +68,9 @@ MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) +Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFD6A36JrHF4yAQTrARAkNOAJ9nUB3t6SptZ7nIsHOs+5Di8FCG+wCgvIH7 -nEEvQXdTf/yQkxSU+kmZFks= -=n41h +iD8DBQFEHHd7AiZjviIA2XgRAi4yAKDVhKA8e3xFNC7JqKqjrW3W+x87DwCeNoRd +yZeCQwA64YVby+AyTUg+Reg= +=B1gg -----END PGP SIGNATURE----- diff --git a/net-print/cups/cups-1.1.23-r7.ebuild b/net-print/cups/cups-1.1.23-r7.ebuild index 80a7f4999a82..702db660db6d 100644 --- a/net-print/cups/cups-1.1.23-r7.ebuild +++ b/net-print/cups/cups-1.1.23-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r7.ebuild,v 1.13 2006/02/07 03:03:12 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r7.ebuild,v 1.14 2006/03/18 21:10:59 flameeyes Exp $ inherit eutils flag-o-matic pam autotools @@ -50,6 +50,7 @@ src_unpack() { epatch ${FILESDIR}/cups-gentooalt.patch epatch ${FILESDIR}/${P}-bindnow.patch epatch ${FILESDIR}/cupsaddsmb.patch + epatch ${FILESDIR}/${P}-respectldflags.patch eautoconf # disable builtin xpdf diff --git a/net-print/cups/files/cups-1.1.23-respectldflags.patch b/net-print/cups/files/cups-1.1.23-respectldflags.patch new file mode 100644 index 000000000000..073000f2f9a5 --- /dev/null +++ b/net-print/cups/files/cups-1.1.23-respectldflags.patch @@ -0,0 +1,80 @@ +Index: cups-1.1.23/cups/Makefile +=================================================================== +--- cups-1.1.23.orig/cups/Makefile ++++ cups-1.1.23/cups/Makefile +@@ -109,7 +109,7 @@ installhdrs: + + libcups.so.2 libcups.sl.2: $(LIBOBJS) ../Makedefs + echo Linking $@... +- $(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) ++ $(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) + $(RM) `basename $@ .2` + $(LN) $@ `basename $@ .2` + +@@ -120,7 +120,7 @@ libcups.so.2 libcups.sl.2: $(LIBOBJS) .. + + libcups.2.dylib: $(LIBOBJS) ../Makedefs + echo Linking $@... +- $(DSO) $(DSOFLAGS) -o $@ \ ++ $(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ \ + -install_name $(libdir)/$@ \ + -current_version 2.7.0 \ + -compatibility_version 2.0.0 \ +@@ -137,7 +137,7 @@ libcups_s.a: $(LIBOBJS) ../Makedefs + echo Creating $@... + $(RM) libcups_s.exp + (echo _ipp_add_attr; echo _ipp_free_attr) >libcups_s.exp +- $(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) -lm ++ $(DSO) $(LDFLAGS) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) -lm + $(RM) $@ + $(AR) $(ARFLAGS) $@ libcups_s.o + +@@ -148,7 +148,7 @@ libcups_s.a: $(LIBOBJS) ../Makedefs + + libcups.la: $(LIBOBJS) ../Makedefs + echo Linking $@... +- $(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \ ++ $(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \ + -version-info 2:7 $(SSLLIBS) $(COMMONLIBS) + + +Index: cups-1.1.23/filter/Makefile +=================================================================== +--- cups-1.1.23.orig/filter/Makefile ++++ cups-1.1.23/filter/Makefile +@@ -130,7 +130,7 @@ hpgltops: $(HPGLOBJS) common.o ../Makede + + libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS) ../Makedefs + echo Linking $@... +- $(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm ++ $(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm + $(RM) `basename $@ .2` + $(LN) $@ `basename $@ .2` + +@@ -141,7 +141,7 @@ libcupsimage.so.2 libcupsimage.sl.2: $(I + + libcupsimage.2.dylib: $(IMAGEOBJS) ../Makedefs + echo Linking $@... +- $(DSO) $(DSOFLAGS) -o $@ \ ++ $(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ \ + -install_name $(libdir)/$@ \ + -current_version 2.1.0 \ + -compatibility_version 2.0.0 \ +@@ -156,7 +156,7 @@ libcupsimage.2.dylib: $(IMAGEOBJS) ../Ma + + libcupsimage_s.a: $(IMAGEOBJS) ../Makedefs + echo Linking $@... +- $(DSO) $(DSOFLAGS) -Wl,-berok -o libcupsimage_s.o $(IMAGEOBJS) \ ++ $(DSO) $(LDFLAGS) $(DSOFLAGS) -Wl,-berok -o libcupsimage_s.o $(IMAGEOBJS) \ + $(DSOLIBS) -lm + $(RM) $@ + $(AR) $(ARFLAGS) $@ libcupsimage_s.o +@@ -168,7 +168,7 @@ libcupsimage_s.a: $(IMAGEOBJS) ../Makede + + libcupsimage.la: $(IMAGEOBJS) ../Makedefs + echo Linking $@... +- $(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \ ++ $(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \ + -rpath $(LIBDIR) -version-info 2:1 + + |