Add metadata from upstream svn to the patch #547252 by Jack Morgan.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 38 insertions, 24 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index b9ed8b6b107a..855b8ea5e088 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.288 2015/04/28 03:04:13 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.289 2015/04/29 01:58:05 vapier Exp $
+
+  29 Apr 2015; Mike Frysinger <vapier@gentoo.org>
+  files/netpbm-10.66-wordaccess_be_aligned.patch, netpbm-10.66.00.ebuild:
+  Add metadata from upstream svn to the patch #547252 by Jack Morgan.
 
   28 Apr 2015; Jack Morgan <jmorgan@gentoo.org> netpbm-10.66.00.ebuild,
   +files/netpbm-10.66-wordaccess_be_aligned.patch:
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 6792ccd22e4e..4250eb0610fe 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -12,28 +12,28 @@ AUX netpbm-10.66-jbig-2.patch 725 SHA256 defe6bd506c73c48eeb94c7a0dd2a2e471823c4
 AUX netpbm-10.66-jpeg-dirs.patch 722 SHA256 8cca55c06fd4f678c069a0ae3e63997a408d54bba9c44150c126d94fd6cce424 SHA512 95a4ab08702faa3d25c75b71329ea28e5eb5f4f0b200d34d7350633e9a999160fe58e8f57fadab30e273c61a06c8d148fdebecbffa5c0b5023c59647f6d4c3ae WHIRLPOOL 877efe30dea24809593bfa214509b69768e443a5f59c6441d94d63e80855e34b6725fbb79658cfb76accdff8acbb6b9a140f99864b82270146fad6e73e754d02
 AUX netpbm-10.66-options-case.patch 3417 SHA256 1d286fc9da28b7cc264b6d227871e3d77f09cfa57fd680972c5147344930ae22 SHA512 2895b71269d321f84e79808a2fe65a8886ce3e173550051ca40563636b3e8561d5c812a3bb9f2e607c2dc7244b56492332a4299d165059d866ca00701adefe23 WHIRLPOOL 6afb3df9509357060879394f3d0c175bdf5db04719280aa5f98b2bb17dee1fb29b70e8594eaa0819cb905b2d00a4b32a61822f48deb60c541942e0e593fdba35
 AUX netpbm-10.66-test.patch 347 SHA256 fb95a101811a6e8b983d6f82130e511658831e6ad2e873fa4632c4049a00bac2 SHA512 bb271d77794fa8b3d5d4632e32d6bd2b5f9522853c6b96c7056fe9817da47b89153eba2653cf3a5a29f597e3fa616e1f6c810bd986651e610176d69b428afb74 WHIRLPOOL 5f59c43abf70d6bc74e6ac6050e25137421f0f3fd5e75e6fb8e77c54f2fc447f26c1a0aeb23ea70dca27bd44b11fdc88fbbd8bcbc1be338acb6f601b9fdcb943
-AUX netpbm-10.66-wordaccess_be_aligned.patch 621 SHA256 4e031c93bf1e50a55ce9c26f0c798abd0002ab1befb92388352db30045cf1b05 SHA512 0fbdc36605a3cb8f1c8f7c3772d01384eca557cbebbfa6ef7c8e6a8a3cada69d05521b98c7241743b3640d53655e119001174559bcdb594981effd64bef71b6a WHIRLPOOL 50ef0c5fcb6eae5da47e35f359695f074a46ad3fd297448423c99ccbd1a5b8e96474a68bc605741e2f7dbc4f0cfca3631473672d1ff8596dfbeb07054118a7bf
+AUX netpbm-10.66-wordaccess_be_aligned.patch 942 SHA256 3a0c8120c69cd6f6f53dc51ec15944d17486e7d6d7a4cffc5a69fb2b94f863b1 SHA512 b3b33b0e32c7bcb126104f0f100b56cb811c1ce5051be854a93d0227d9a684e440dd9e0787dfe3f4cb12df1fef5b2e6d1ecb6c3a49d630a32595a026ae1fb482 WHIRLPOOL 2288bf481ae97df10b56d89a022b16659dadafdf0c207bc4a5ac501f029d0b4633999691f2849f8f1692be5d9370944e6e1a501dcb082482f0b8bb9cb843ea97
 DIST netpbm-10.51.00-libpng-1.5.patch.bz2 8120 SHA256 260a5f0e9834e7e1aa5c2dcc292695aa43b5aa198af1cb33e5705f7cac10da7b SHA512 3bebffb798e72e5ff872b482d43dffbd174496d1ca46e88bcb3c19f2b94cdfe2037aa1f19a22a40996503ccc03929bd28570722874a0c74265b083fbc66b24c4 WHIRLPOOL cbf1efd16ac7acef1fa318454f24afbd7f68eded7343168783ce8fd5dd389b9d97e7a9237cf4d6315cdeba462c9d84fb7011ddfa2df592b1fe15f4462ca0d623
 DIST netpbm-10.51.00.tar.xz 1834148 SHA256 6d7bb30d1d0e7f6a23b55c6f03bbb20b539909ad84281dc944b1072656dc1d0e SHA512 07b621bfebbd051a80eff09886bc2b3b4f82b01fa9087d6a76ed70a042493b69fb3295d471640a4576101ba19352a57eadf69c5721d9cc416d25ff563ee07c76 WHIRLPOOL 25cbfbdd575fe1c032ce1bb700181175b1386d481990e516ce62d953b1d37091c32ca2016c487d4963af1b8c79ec04953e59181334d2a53b9d5701acedabdf2a
 DIST netpbm-10.66.00.tar.xz 2575356 SHA256 7fe94f38e139be194e9e384e8d9c9747f2fe08c18295bba93c55a41c5bbf63fc SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af WHIRLPOOL fa937fccd2da9068a268d6a5729c8093baacc3025ab2382902611dadab985247fdacf3433f6e15407b081478b93b772237c41363f37340ea6c93c169357dd0cf
 EBUILD netpbm-10.51.00-r2.ebuild 4876 SHA256 64ba1ded0af46f473325f4331d9c2f0bd4a01b01d2a9b13cfbd10100f6716cf1 SHA512 8a8a70195e352b5c975a74f060c6d412c781f4162aa00746c71e803bbb95c95c0487d1394b72099b52fd5b03cabb3fc13726b283905aad20028372d0f3e08537 WHIRLPOOL ad468b638a5d9ba18bf753a7cd69d1cacced523ec1ae0bece3f040f388cc1681ce40bfdb2f1109b8d5f6585eeb72a475685d78084891d8a56dd6da02ed829ba0
-EBUILD netpbm-10.66.00.ebuild 5603 SHA256 7f65ef8fe09d4d62fbb9308f1ac6c8fe9d175eb24a21e972af821416200a3947 SHA512 4bc10d1caf90379b1967ede5414d66395d459221349f2bb69900d9f8f669df144eb4d5f684697a7d2c63d2c4c9326e09b0008c7cdbfd05cbe3ef8e38b758d31f WHIRLPOOL d28a1454fee46c0090f099152ceef0c91d5b61e8518902e5333b55bf6306b233edb342fdef8f5780405e834375fd9ad85423d7b56322cad611ec794b491517a0
-MISC ChangeLog 40508 SHA256 341fe8da3f8da2382b34e04e7d8b20f473658de17d4e8c02bbec2f1415b45179 SHA512 06e16ed34276bbf03ed60c842b9f689c14f0c5b9cbc8e4d998a3d2a55d1e4cf242989e6bbddf9973dd0f80d13b68886d840c48fa75f9b473598bd9cd9c3b2615 WHIRLPOOL a9c1e283354987e433fdea2780d0e54640d17ef06a2d4f7e2c5457fbaea98630c65cb84d3af285a0654a5c1a3167c2b6e14f03df37c644e3198e47f83f0bf010
+EBUILD netpbm-10.66.00.ebuild 5610 SHA256 c7f7a103819c6635dfb49c20c87230b9da145eb3add2beb6664384c9334f66ff SHA512 0b373882bbdd642a7c1b898977d8eea1a31dc8af554372a80c12fecc72efbb65bd2d489543510d6d71358eecb7be1cad6b458e4cc1a14f0fee43030ec312fc2d WHIRLPOOL 9f411185da942a5e394a446da1d63fe141415fdc678a70c9e6abd4c751a1706c3638af8d05f0de215584c55e7c22e72b96be22ef51c8e274b632c8ae3baa2074
+MISC ChangeLog 40702 SHA256 d351128e27943202b839c5042cc6ec1b65b0176baa65e3c69003d285f2544b42 SHA512 c49a8ee713d91ef1647453597af71de993e69957b9037a3be40d93c520c00402186ae3bdcdf74dbe1578999ad5c7e0f3a7c42b7b53c9b969780275a490ab7337 WHIRLPOOL eb157051a4b06db077ad71ae567e38c0b7d3f8f599e47870bd1449cc0a53afb6349627163b4e5d372cb7b343f9820d83e7bd2f22933ec3a9e5f9a40e6af54f06
 MISC metadata.xml 261 SHA256 e04079912e263782a8c0e4f115e49ff3694535ff2efef7b7fff85cf8d100102b SHA512 e7bcb8f689bd7da37e414a3f33b125d52a5ec0d376e821edd58d352ffb502098fbe8b7d24c0eb073822e41a55c280f84558ca4314dd37ac20adcf6471bd712af WHIRLPOOL 9aa2223d48bacfa917affeb56dc180becb54fc612e69ce6d26496d45cc42fd1050e2a40c77957ee7f37b3e2665adc0c95f08b60fab1787d3292905f0a4c8092a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVPvifAAoJEL9Txpt2HY4KabQP+QGUpJ1Qhg3ZdzWBunFhCqNM
-oHVkDeOJDlUwco4wqIj4E0Iun4c0kDTEY/9ECdt+gHYIbU/0IdZx1fF69esP8Bsm
-vYelgSa3To/D6XUP+ZMgCvENBae815bXrB/qnZ4f7X7u+TX/FatRI7TNsQaS/gx0
-w5zTfskVJstROBEhjdo+xrCyxKyxnbbijhfjrg65MPcc069v3fA7YH2XsDuu2k+N
-my11eEw1OCIB5msyyuR6S3/3VnL9M+Ei+oZMBy168toSZFc2ACyp5INH0WaAHxtM
-aFZEBeRDoRMk8hmgHGsB1D+o0l7gXKSC3iCKGlpQqDhZzm5pvXAhnSBEHdgeGa2z
-G6ZTK2jLhGdNG42wvZMZflXsXGG502tzzz2oT9SkEtgd3Pi7KZyq8I2Hsetg9PWu
-BKvlU0ANvUgaTO5AFo0n+KC0Ftr/MJJBICw8y9onJtA874EALQju4z4QyzfBFVIu
-DIeY4MRczq8afG1gXP/eOaMQbhl65aeIGoCF66Phtic3tR90LuzWHcnOrZZBKiw5
-/JBwvl8VykF17ZSbVXvcVRxnQFdIIBCLRt2KPAA+8r3AQ9MC/zYF36l9a8mL2PDq
-2oAV5YF9L6ALF0ZUaD12xmvR+t/Wt1Fwf8z5m26DOuSDWj1HUtfTz1gDG7uZWqYY
-2Kj8/E2ZI0uGjGtKjQpo
-=G8DK
+iQIcBAEBCAAGBQJVQDqvAAoJEPGu1DbS6WIAbK8QAI78/d0QWQinlN5MyE+dbbRB
+vi6vytOhKCdruUCp/CMgvawc+F8q7DM0r2HtqUBIKRtYMoIeQoTEPOc20NoVNzW4
+6KM4T/9jkSflYLuOmacVOmUSOB8K9GD04OqsCMff9b0paR9sizdIqW+B1dW31ooQ
+S+1U4G8M38+Xmi3da54Drd+kKOm/GbDnCBZ/k6iw7iCv7uN17vS38F86F3u+LDEB
+Q0YSPO9rgIDHeYG0lR8m3+uMh8J9eDcddtcTlxBcbbQ57a0XvxjGSdxw/oyMwtj+
+0fP6+Jzvby8CHwq7J6i41vyytN9+Bus1FQkPWWlLp1MQ/bpEu1SS7E6MJn6P16Zc
+4KQ5UNWII76OEdX9HletFwZvziF5GhXs7xQUJOMmIA9iSkDstG1Oc9z/90KDr91S
+uqrKsD85CtCRIQheHdQf05TJECwlX1K6eCXLH0KUbaJlivIKteo1WS6K0yVYc0Kn
+oOv2jW1UD7GBq0OSeQb41CgcS3n6HyZyLxT9xWzrDNe3ZnIAI06VkQt86q8iva2i
+0itsFo9tb0aALB/j/z41yb1Ph6Jx8yKlrTVnKIrPi4iZt7BH0KESl7p9evDFNmpl
+kCLoHmtjiCIK7kNqUohI+iI9woLHcIIAXKgQESqlGO7D7CPECvf3O4OW/GB1fPmd
+G52pz33I7w3O5S6cLcB6
+=iG2m
 -----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch b/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch
index fab864975bdc..0da719ae07d4 100644
--- a/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch
+++ b/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch
@@ -1,7 +1,17 @@
-diff --git a/lib/util/wordaccess_be_aligned.h b/lib/util/wordaccess_be_aligned.h
-index 0d5809e..f3bbb84 100644
---- a/lib/util/wordaccess_be_aligned.h.orig
-+++ b/lib/util/wordaccess_be_aligned.h
+https://bugs.gentoo.org/547252
+
+------------------------------------------------------------------------
+r2395 | giraffedata | 2015-01-23 13:51:17 -0500 (Fri, 23 Jan 2015) | 1 line
+
+Fix syntax error
+
+build: fix compile failure in wordint_access_be.h with
+Bigendian target platforms.
+
+Index: trunk/lib/util/wordaccess_be_aligned.h
+===================================================================
+--- trunk/lib/util/wordaccess_be_aligned.h	(revision 2394)
++++ trunk/lib/util/wordaccess_be_aligned.h	(revision 2395)
 @@ -24,7 +24,7 @@ bytesToWordint(wordintBytes bytes) {
  static __inline__ void
  wordintToBytes(wordintBytes * const bytesP,
@@ -10,4 +20,4 @@ index 0d5809e..f3bbb84 100644
 +    uint16_t const hi = ((wordInt >> 48) & 0xFF);
      uint16_t const mh = ((wordInt >> 32) & 0xFF);
      uint16_t const ml = ((wordInt >> 24) & 0xFF);
-     uint16_t const lo = ((wordInt >>  0) & 0xFF); 
+     uint16_t const lo = ((wordInt >>  0) & 0xFF);
diff --git a/media-libs/netpbm/netpbm-10.66.00.ebuild b/media-libs/netpbm/netpbm-10.66.00.ebuild
index 739a110aad9d..9cedcb98a855 100644
--- a/media-libs/netpbm/netpbm-10.66.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.66.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.66.00.ebuild,v 1.14 2015/04/28 03:04:13 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.66.00.ebuild,v 1.15 2015/04/29 01:58:05 vapier Exp $
 
 EAPI="4"
 
@@ -61,7 +61,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/netpbm-10.66-jpeg-dirs.patch
 	epatch "${FILESDIR}"/netpbm-10.66-jbig-2.patch
 	epatch "${FILESDIR}"/netpbm-10.66-failing-tests.patch
-	epatch "${FILESDIR}"/netpbm-10.66-wordaccess_be_aligned.patch
+	epatch "${FILESDIR}"/netpbm-10.66-wordaccess_be_aligned.patch #547252
 
 	# make sure we use system urt
 	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die