fix hppa build issue, bug#471914, again... there is duplicate file

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

3 files changed, 44 insertions, 9 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 4f303db403fd..2b851c796ae8 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.444 2013/06/15 22:37:41 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.445 2013/06/17 10:33:09 alonbl Exp $
+
+  17 Jun 2013; Alon Bar-Lev <alonbl@gentoo.org> files/gnutls-2.12.23-hppa.patch:
+  fix hppa build issue, bug#471914, again... there is duplicate file
 
   15 Jun 2013; Alon Bar-Lev <alonbl@gentoo.org>
   +files/gnutls-2.12.23-hppa.patch, gnutls-2.12.23-r1.ebuild:
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index ffffd4e6fbcf..0c613e3998bd 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -6,7 +6,7 @@ AUX gnutls-2.12.20-glibc-2.16.patch 938 SHA256 9e0383563d5a358680aab3ddf1464d207
 AUX gnutls-2.12.20-guile-parallelmake.patch 349 SHA256 f6c81df63b3dce52df7754cffe9dfae0b94fcb1bedd68cf99d5546b4f00a8c37 SHA512 2c92817e1ac43e301f0c39edca0991e832a875204e9232106f660157f1db91ce942569ef16193f6b1e80038f3a000836f4ac2bb3d728d4bbb602e09f46ba5efd WHIRLPOOL d578f81a0d645c7430301aa35fb15cc4fde3acc044758f28d6046742053965c0b27c0a2d738794bfb6ce27164331b11387402413b40abac8d95192741f1d710c
 AUX gnutls-2.12.20-libadd.patch 988 SHA256 b1f73ec17feb72817f39f109ec2e4dc69ea8d6b6d62ef243491e85164ff513ac SHA512 a0552276b356fd63e802a886e1243ef6341c6b8d1857814a0b2a686fd605d7c03316965cdfcdb70162547033efe9f2d1c17e442a30925d97ef691c2d573eba68 WHIRLPOOL 4ed528cb20705d91db05f0c533cbfd0356fa3292393eba75b45a22457cb23da80639ef739d889af4f64038a97553f3f990cc08f5e31608b1dc83c74b0e1c46d3
 AUX gnutls-2.12.23-CVE-2013-2116.patch 855 SHA256 473663119e3c0c91677becc2982f6bddcbe44000f9530515ad2051982c8a7e57 SHA512 463add69c9db348e1e7b93ba2e7bff3ce62abc96731485955e36e6855e3e2a1fb53f082238cada537487285e15d94296cf3fd3d408a013c307ff195685896fc5 WHIRLPOOL 10576ef2591f8bf47148a37bc5690abca474691edab802cf46967b8695c838d1e477a5731f677c8951b0652981ba338c42e14479e33e8dfccfa7952ab56f04a9
-AUX gnutls-2.12.23-hppa.patch 478 SHA256 2458330f428d6fc4fb8dd6177b225a9006ae20eaa5a2b337856cd070f75cded6 SHA512 04e25aca9e359eb519a56b56cbd88c0502b50ce16c726756442ec4eede31b25ff23011380a5ea7778b6e1191cfe5d2ee8c3d435131d57becd23d2c4eaa4edf48 WHIRLPOOL 72caac1a0a29850f23a7a1ea894a2545021e2bd90f11bb8d9510c2de92bd8f9b49988ad590addc52244e0bb9b834cad151b2f07776f751137535f42ddc0a29e4
+AUX gnutls-2.12.23-hppa.patch 1165 SHA256 68958ca9d05f6ffe89064488847d5e2ca615344abf7c9060f73f525a593716f0 SHA512 040507b973788dc2ca4aab19d69f45011e6509354e38ec875ab6fdec3f1c3be40272ea99cd53a5adfc8b52b30e29d86af80891d57b50068a4b3f2cc20246ac70 WHIRLPOOL c4d17452c22e81fdcbd6e14aaaf8294a90a67438ebcadcaab096a6d2f115643c2ce36cc503d186d2d2483366b890add3e9101c26998878817f7baed8589a8514
 AUX gnutls-3.2.1-build-gmp-1.patch 2537 SHA256 997c152757f42beb68e395093ad82751dccc4007d66e78f16ff19150d8815dd3 SHA512 9525128d098f3a03b0a73d1296d0f512315bfba37a48215a0109521dc7aa9990a5dfb794ec2b92436ec8189b93a3997673be4abcbdafd3b015b2fd196d15fa96 WHIRLPOOL f789cd4260c7e052e28a0a86ffe7c1ade2df739acfcea9cd4648ee1b958541f7013d61bf545908e0ba428b163ef48c9e587dd903ed839691ae5f8bfd0ebe2035
 AUX gnutls-3.2.1-build-gmp-2.patch 1038 SHA256 ecc6fa9c76f3da6fe795baf21c0666c3c38aa25d01a3cc15631aef5c229219c2 SHA512 dcd3fb728413852972fc469c8de22c61a15630872b4a4eeba74ee155207dc620af2ac0b0aa8cb01b22e11444fd555587c0666b0e9d4e183e5e238938724ce2f1 WHIRLPOOL cf6a0a2440faf31f60f89a67e75a27cab9164c7aa361124943769069c9289d9ecaeec414c2ddb3dd8604599385bbbc88a5a6ef817d91279e4354dd47228b5a61
 AUX gnutls-3.2.1-build-gmp-3.patch 1143 SHA256 c0db6e13c2f1a2357aa79dfce00b4e2d8ebfdd1f8820b5e0966749e0471597ca SHA512 82b14c9e2fb126f0ad5cf188a1c8863acf925eb74538afedd13524b9a20f41a65bd081a6ecc0a9a39b3aca74d66e1bed53753e319f47b6e4a8eb9f820a72201f WHIRLPOOL 31deca473b5af14a94dc318aa9b535ef25cb1c9820e41a57ed6d2c242ad1c0efaef2b211c707c1e673ce2e6fb48fd3c6bf13095c279cbcf1646a38230af7a7c3
@@ -21,12 +21,12 @@ EBUILD gnutls-2.12.23.ebuild 3399 SHA256 0e8b84dd493bd28b51bd537752c617eab98c594
 EBUILD gnutls-3.1.10.ebuild 3143 SHA256 c92de271426a888c6494466bf61560b686fa85a136fc4e928bdb4a8f02438466 SHA512 86b508b2948d06bf4d45ad1ad04ae54a607f86d9143c7249388a3b97b64c6724de4105275ec12cc1df5235969bb4b358a4b8d860e658908a56ca89ae8654fd19 WHIRLPOOL 899242afea605e03f0f577eeeb65693be1496e2be0fe09a8dce8505ea6e4d9b352dc81d66417524e4230a4e856e0933f93e2d120e137983fc9870b5ddd06d28c
 EBUILD gnutls-3.1.11.ebuild 3143 SHA256 d35cff2e64300399eac31fd52c9ee1c331c2eed344a4a45ce19a64894b00c192 SHA512 339444967b8623a7214ece9a70ad7073b77185e6ee0ae409ca1788443e826cb30697d27ef93103835dea0cb32505d6a0f28fbe49eed8b411e0eb58e2222ed5cb WHIRLPOOL 7e925c27affaf1bfe2881b3bb6f4c1af21c32a596faf1df2a206ccaecf412dca93078e9e4a4f86c640a22804fd3ed65b6291ed10e2a896ffcaab6493ca97413d
 EBUILD gnutls-3.2.1-r1.ebuild 3202 SHA256 2c5339e64da4460d7e5cc7bb615496700eb39635238ab4a8d92e9ff3488405b9 SHA512 811e73978b5d625c97ca9122c05e928e59e33ce891daa43824ee9f76ecc88e6bf05a2afa732db583f0e715082b42a02e591c93cd2f1662eb452e82d3d3c688c6 WHIRLPOOL e5ae4abb028ebf18f8362ceaa2e1d6dbf13f17a488c2d69f56ac2f3d683d5f93a8999f23996d71de7902a8028105f87238b649c9e1cffb973583711a5c0835ff
-MISC ChangeLog 66099 SHA256 f7f77ab55a33c6c2cf0055e3acfe0b212c6e263582a57a0e3e6f1b1c59edaa42 SHA512 0debd085bd502d6e8ca20df2e3bd1ce8d4088756e3965e3e01ed633e2cfb46d8e0414a126833038bcc4b0768b0278dacdc182e5343ae7ed8ba71fb4294be1702 WHIRLPOOL 0c7e042545d0dc2080c7de2e83a2b4cc23352d239e7df780adc0461dae4d41769b9b3ce983e4e141dda318834d9a638f70cd4236413e6796a0f01d142638d00e
+MISC ChangeLog 66250 SHA256 bf99c050434c0f52aa9abb2d8b01d7ac9c00028e33e5cb3dc3900aacd3bf16ae SHA512 453ee6fdae06157a74a5217b3b5af56d53b264148d1f242d02ad70589b9a20de48afb11cdb7d4bfd74bc67cc670bd701eb091c5027e2414bb61c8bf9bdc33733 WHIRLPOOL bb3205f667102974979d56233f31a335320167d3c9da6bf97b259b8ac4ce3fce2e8aa8ed1008a72d9428c277faa110cab0022566cbf67740e08bcaeff9ac9d45
 MISC metadata.xml 756 SHA256 508edf0b40fd5b36f9e173fc16c9f8983e2fa11d71fcfb427c09be33f09e5aeb SHA512 c752dce48775632e1ad674f2a3f3195c6c68bc3130d5bf38ac63835763181f18105b932b2b65d143872f6eea0de1166f039e280d8b34e340500cef81fa4adbd4 WHIRLPOOL 5f95630b2551b6661a157a0c232f190f7b9647b8f526b6ee4812e36858fcf11ec0452e0519edbfef8591452ac20c68c95d3315511ed42bc7366f48baec76716c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlG87LkACgkQXYk9GL8g3FG/oQD+ICGcvf2DE9liBtE9/a8KMoh0
-GCbDo6SJMMAFBFr2h9sA/jWGotGwleqpCywhx5DgS4hLEu0naQWpuUKZZjRcuIIh
-=A9yb
+iF4EAREIAAYFAlG+5e8ACgkQXYk9GL8g3FG9QQEAnQJIVeXICyt8DoXov9EHJek1
+xT2MkdACfMrbXP/CIsUA/0EmivoZKGK1kXRyJbVFlqMVxxs9iBsypN9CJq/yAUM2
+=EvGa
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-hppa.patch b/net-libs/gnutls/files/gnutls-2.12.23-hppa.patch
index 3ae5be8be3ca..16981cf2e91b 100644
--- a/net-libs/gnutls/files/gnutls-2.12.23-hppa.patch
+++ b/net-libs/gnutls/files/gnutls-2.12.23-hppa.patch
@@ -1,6 +1,22 @@
-diff -urNp gnutls-2.12.23/gl/tests/test-fcntl-h.c gnutls-2.12.23.new/gl/tests/test-fcntl-h.c
---- gnutls-2.12.23/gl/tests/test-fcntl-h.c	2012-11-11 05:16:55.000000000 +0200
-+++ gnutls-2.12.23.new/gl/tests/test-fcntl-h.c	2013-06-16 01:31:28.315827891 +0300
+From 043fe2c28a5f6b3ec6202090faaf7933b247e40c Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Mon, 17 Jun 2013 13:27:55 +0300
+Subject: [PATCH] build: fix hppa compile
+
+gentoo#471914
+
+O_SYNC : 262144
+O_DSYNC: 262144
+O_RSYNC: 524288
+---
+ gl/tests/test-fcntl-h.c     | 2 +-
+ lib/gl/tests/test-fcntl-h.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gl/tests/test-fcntl-h.c b/gl/tests/test-fcntl-h.c
+index a6c9621..9e13491 100644
+--- a/gl/tests/test-fcntl-h.c
++++ b/gl/tests/test-fcntl-h.c
 @@ -111,7 +111,7 @@ main (void)
  #if O_RSYNC && O_RSYNC != O_DSYNC
      case O_RSYNC:
@@ -10,3 +26,19 @@ diff -urNp gnutls-2.12.23/gl/tests/test-fcntl-h.c gnutls-2.12.23.new/gl/tests/te
      case O_SYNC:
  #endif
  #if O_TTY_INIT
+diff --git a/lib/gl/tests/test-fcntl-h.c b/lib/gl/tests/test-fcntl-h.c
+index a6c9621..9e13491 100644
+--- a/lib/gl/tests/test-fcntl-h.c
++++ b/lib/gl/tests/test-fcntl-h.c
+@@ -111,7 +111,7 @@ main (void)
+ #if O_RSYNC && O_RSYNC != O_DSYNC
+     case O_RSYNC:
+ #endif
+-#if O_SYNC && O_SYNC != O_RSYNC
++#if O_SYNC && O_SYNC != O_RSYNC && O_SYNC != O_DSYNC
+     case O_SYNC:
+ #endif
+ #if O_TTY_INIT
+-- 
+1.8.1.5
+