really fix the depend on libopt #110257

Package-Manager: portage-2.0.53_rc6

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index b015470803f3185b2a42fe5fca4b3eb7c67bd4b3..395e3333ef2f61cf3630531c26ce95da3f2621f9 100644 (file)
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,14 +1,14 @@
-MD5 83c03cdedf5536372bcc63f4c747ff35 freetype-1.3.1-r4.ebuild 3091
-MD5 40161b63bd5b3d8af07e6563561d13aa freetype-2.1.10.ebuild 1812
-MD5 49769e5e0f8f1f2d4ff5e8aa103cfe0f freetype-1.3.1-r5.ebuild 3191
 MD5 0137513c803ccdff538ea938a4ef5c9b ChangeLog 11396
-MD5 68a04e23ccfb7971cff8ce012aee659c metadata.xml 221
-MD5 be70a34545fbf083a16aedca4c1c1c43 freetype-2.1.9-r1.ebuild 2160
-MD5 6c404648e3cb8f86b329f7dac5d70cc8 files/freetype-2.1.9-fix_bci.patch 643
-MD5 f96e5959658f100cb8d1af8a197b8c45 files/freetype-2.1.10-internal_header.patch 667
 MD5 10bd432787c1a182edece351dbf82809 files/config.mk 1240
 MD5 d42207bb27a2046e454b706339adaa25 files/digest-freetype-1.3.1-r4 136
 MD5 d42207bb27a2046e454b706339adaa25 files/digest-freetype-1.3.1-r5 136
-MD5 51968a6fff68a83653c7281147312e77 files/freetype-1.3.1-malloc.patch 772
 MD5 f9a58f527647abffba59f1db219693a4 files/digest-freetype-2.1.10 141
 MD5 29bbc2c883bf52623f42dd235cd23fd6 files/digest-freetype-2.1.9-r1 132
+MD5 51968a6fff68a83653c7281147312e77 files/freetype-1.3.1-malloc.patch 772
+MD5 f96e5959658f100cb8d1af8a197b8c45 files/freetype-2.1.10-internal_header.patch 667
+MD5 6c404648e3cb8f86b329f7dac5d70cc8 files/freetype-2.1.9-fix_bci.patch 643
+MD5 83c03cdedf5536372bcc63f4c747ff35 freetype-1.3.1-r4.ebuild 3091
+MD5 49769e5e0f8f1f2d4ff5e8aa103cfe0f freetype-1.3.1-r5.ebuild 3191
+MD5 86b12a7a70a9bc33ce24198144f753fc freetype-2.1.10.ebuild 1810
+MD5 be70a34545fbf083a16aedca4c1c1c43 freetype-2.1.9-r1.ebuild 2160
+MD5 68a04e23ccfb7971cff8ce012aee659c metadata.xml 221

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 96c1fe405624ed5eb6e9858bb2f3618dc680453f..35c736b6300dbb5391af1929758bdb9bcf1950db 100644 (file)
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -6,10 +6,10 @@ MD5 8c4a20ca06c83687436b8cb75917d5f1 files/digest-netpbm-10.29 62
 MD5 e03ba0a74da10891ecaa41fb86191275 files/digest-netpbm-10.29-r1 136
 MD5 af57721491b0a7cd11ccba542d8e20c6 files/digest-netpbm-10.30 136
 MD5 3e364cbe32c6c5bd2f329b8dbcf604d5 files/netpbm-10.29-anytopnm.patch 1562
-MD5 102062d84b1750c991d13e5528a9420b files/netpbm-10.29-build.patch 2278
+MD5 e3ef1ff99bf9335b47ea62db7416b625 files/netpbm-10.29-build.patch 2283
 MD5 103e8f6f6474dcc4b17ee049111bc3f6 files/netpbm-10.29-infinity.patch 5840
 MD5 d0d44fe5de727324db35e8110dc81f63 files/netpbm-10.29-pnmtopng-alpha-check.patch 603
-MD5 ffa6c02e94b0dfc779d129cd7e09e928 files/netpbm-10.30-build.patch 1886
+MD5 c63d12c2c7deaafa4fcddb6035b34169 files/netpbm-10.30-build.patch 2276
 MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818
 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
 MD5 e1d7f1307e675fbbfc3a07f2539c0708 netpbm-10.20-r1.ebuild 2442

diff --git a/media-libs/netpbm/files/netpbm-10.29-build.patch b/media-libs/netpbm/files/netpbm-10.29-build.patch
index 0da80ef812ff86cace6da9b5f32fc224d5aa3aba..eab109a3c6a34b9fc5f2719a155680afe125e208 100644 (file)
--- a/media-libs/netpbm/files/netpbm-10.29-build.patch
+++ b/media-libs/netpbm/files/netpbm-10.29-build.patch
@@ -33,7 +33,7 @@
  .PHONY: nonmerge
  nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
 +
-+$(PRODUCT_SUBDIRS:%=%/all): $(LIBOPT)
++$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
 +converter/all analyzer/all editor/all generator/all other/all: lib/all
  
  OMIT_CONFIG_RULE = 1

diff --git a/media-libs/netpbm/files/netpbm-10.30-build.patch b/media-libs/netpbm/files/netpbm-10.30-build.patch
index 902f9aa5ab4be54dc10213537e680af1daaaebfb..8f42f65e80da14b3ca2a063800005a0139727af2 100644 (file)
--- a/media-libs/netpbm/files/netpbm-10.30-build.patch
+++ b/media-libs/netpbm/files/netpbm-10.30-build.patch
@@ -1,6 +1,7 @@
 - Don't install libnetpbm.a and libnetpbm.so into a sep link dir
 - Try to fix parallel building
 - Make the libopt tool less 'helpful'
+- Remove pointless echo during build
 
 --- lib/Makefile
 +++ lib/Makefile
@@ -32,7 +33,7 @@
  .PHONY: nonmerge
  nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
 +
-+$(PRODUCT_SUBDIRS:%=%/all): $(LIBOPT)
++$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
 +converter/all analyzer/all editor/all generator/all other/all: lib/all
  
  OMIT_CONFIG_RULE = 1
@@ -58,3 +59,13 @@
 +        if (shut_the_hell_up == FALSE)
          fprintf(stderr, "libopt results: '%s'\n", outputLine);
          retval = 0;
+--- converter/other/jpeg2000/Makefile
++++ converter/other/jpeg2000/Makefile
+@@ -57,7 +57,6 @@
+ include $(SRCDIR)/Makefile.common
+ 
+ $(BINARIES): %: %.o $(JASPERLIB_DEP) $(NETPBMLIB) $(LIBOPT)
+-      echo deps: $^
+       $(LD) $(LDFLAGS) $(MATHLIB) $(LDLIBS) -o $@ $< \
+        `$(LIBOPT) $(NETPBMLIB) $(JASPERLIB_USE)` $(JASPERDEPLIBS) -lm \
+         $(RPATH) $(LADD)