Apply small patch to fix bug 314825, Thanks to Dan Ziemba < zman0900 at gmail dot com >

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 31 insertions, 5 deletions

diff --git a/dev-libs/libatomic_ops/ChangeLog b/dev-libs/libatomic_ops/ChangeLog
index 48cee9fe3223..835790478b5c 100644
--- a/dev-libs/libatomic_ops/ChangeLog
+++ b/dev-libs/libatomic_ops/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libatomic_ops
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/ChangeLog,v 1.20 2010/04/09 18:53:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/ChangeLog,v 1.21 2010/04/18 21:02:31 pchrist Exp $
+
+  18 Apr 2010; Panagiotis Christopoulos <pchrist@gentoo.org>
+  libatomic_ops-1.2-r1.ebuild,
+  +files/libatomic_ops-1.2-fix-makefile-am-generic.patch:
+  Apply small patch to fix bug 314825, Thanks to Dan Ziemba < zman0900 at
+  gmail dot com >
 
   09 Apr 2010; Raúl Porcel <armin76@gentoo.org>
   libatomic_ops-1.2-r1.ebuild:
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index d2fcd5fdd709..7c061976222d 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,10 +1,11 @@
+AUX libatomic_ops-1.2-fix-makefile-am-generic.patch 885 RMD160 7ec0aeef8af9e1eef8064362e3225613b0e56b3a SHA1 349422d53f920cebd5c91dd33eaf62686561dda2 SHA256 8dc0bba7d005cfcd8a831cbb35a73e1429091f0d81fb269c0592d77b4486df4b
 AUX libatomic_ops-1.2-ppc-asm.patch 427 RMD160 89773869a9336ff64aeac2b34091f3f93abd7817 SHA1 22b5a82efaa3e59d3f2372be51894201747d21e9 SHA256 a8cdb35c08084878a10c72ddfa318586135142dbbbb346e0d727e9d170eb28bb
 AUX libatomic_ops-1.2-ppc64-load_acquire.patch 1383 RMD160 d3d368915d613b8a8f4af4806ede9e9f53d3eadc SHA1 6ca477928f48f7cc1f2515eb3d8f99af7d118807 SHA256 f061cdf1e70448a193abe316d9c4b4f6b924132a99abcea9753b1440274304f1
 AUX libatomic_ops-1.2-sh4.patch 1839 RMD160 cf6c3ed80ab23bfd20fcf76fd9586921dca76799 SHA1 b8651412ed000cdab7fb97741996d59249712421 SHA256 64c53b6c5cac37893f0e81e63a396f04ecc32933480cbb90798fe9dc558bc505
 DIST libatomic_ops-1.1.tar.gz 178581 RMD160 ccfa008ece3365390a05badcfd9580ffa96d0302 SHA1 4412ad70afbd5dd954378b94aa3e7e02ba89ecc3 SHA256 f5fb0d89b5b26a7f0bb00c92463aeb62a425c491391bc7e36660a1ac0b5a1f13
 DIST libatomic_ops-1.2.tar.gz 183780 RMD160 8c548b32033c954a61e740f9a0e76ca8f005c4f6 SHA1 8bf4134d614acb1a6234b3102e67a847ae9369b0 SHA256 a3d8768aa8fd2f6ae79be2d756b3a6b48816b3889ae906be3d5ffb2de5a5c781
 EBUILD libatomic_ops-1.1.ebuild 619 RMD160 504726b1cbd8050d8e5291aa75adaf7dcc57ab93 SHA1 aeed1ccd99a56308de8729e553633d88bd89c5b6 SHA256 822e4bf132b233c6f9be11b6411e31972a25aaec9540f15f4a71ee290e4d022d
-EBUILD libatomic_ops-1.2-r1.ebuild 936 RMD160 4cc92c9c349d8b01f32246bbfdb2bd775d8f01a4 SHA1 87404461624a62cddfd918b7b164839a587bbb97 SHA256 57a8404c63c4f5c8af8509bb7f14c8dcedae960cd00de3139bfbcd9d89d3a344
+EBUILD libatomic_ops-1.2-r1.ebuild 992 RMD160 aa119a7e0342b30dd14a1de36fc15a5566bac38b SHA1 d7f788b109deb47a86fc2c12793282edb96a9423 SHA256 bf65c764de3fbeeedca2fff4423c018829f752d84f32e153d9180ef96472c7ab
 EBUILD libatomic_ops-1.2.ebuild 779 RMD160 ace6b11c94d75ef6ce3ba1b3bec89389cce8bceb SHA1 59616687d2624f1c5354b3a289767084d345c679 SHA256 750a492175e5325b1c37d83c5398d99ffb7fd2bdd4077ff2b8dc95338bb56407
-MISC ChangeLog 2886 RMD160 bccd6a5f105f43040bf7eef4c774c19d0cbd859a SHA1 18b2185815e0a331f29ad7f891b7028e77429416 SHA256 6167c13c5934e92f6eb99bfb48308af32b8ffd3beea9957a9356d100daf74842
+MISC ChangeLog 3129 RMD160 44fdba5ab4e9bb09ad80bc1623494f10b8cb8f04 SHA1 bfaa663743bce882249625c2840465bb75a90f3e SHA256 89c3d908462c285ecb411bdd78d1303b170b0f3222faa876e19189ba711ecdec
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-1.2-fix-makefile-am-generic.patch b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-fix-makefile-am-generic.patch
new file mode 100644
index 000000000000..7b1f898ef9b6
--- /dev/null
+++ b/dev-libs/libatomic_ops/files/libatomic_ops-1.2-fix-makefile-am-generic.patch
@@ -0,0 +1,19 @@
+diff -u -r a//doc/Makefile.am b//doc/Makefile.am
+--- a//doc/Makefile.am	2005-03-22 00:05:19.000000000 +0200
++++ b//doc/Makefile.am	2010-04-18 20:08:13.000000000 +0300
+@@ -1,3 +1,3 @@
+ # installed documentation
+ #
+-dist_pkgdata_DATA=COPYING LICENSING.txt README.txt COPYING README_stack.txt README_malloc.txt README_win32.txt
++dist_pkgdata_DATA=COPYING LICENSING.txt README.txt README_stack.txt README_malloc.txt README_win32.txt
+diff -u -r a//src/atomic_ops/sysdeps/Makefile.am b//src/atomic_ops/sysdeps/Makefile.am
+--- a//src/atomic_ops/sysdeps/Makefile.am	2005-09-28 02:53:16.000000000 +0300
++++ b//src/atomic_ops/sysdeps/Makefile.am	2010-04-18 20:04:03.000000000 +0300
+@@ -25,7 +25,6 @@
+ 	  README \
+ 	\
+ 	  gcc/alpha.h gcc/arm.h gcc/x86.h \
+-	  gcc/hppa.h gcc/ia64.h \
+ 	  gcc/powerpc.h gcc/sparc.h \
+ 	  gcc/hppa.h gcc/m68k.h gcc/s390.h \
+ 	  gcc/ia64.h gcc/x86_64.h gcc/cris.h \
diff --git a/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild b/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild
index b767fbb13224..bb05b9a5cd2c 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild,v 1.13 2010/04/09 18:53:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/libatomic_ops-1.2-r1.ebuild,v 1.14 2010/04/18 21:02:31 pchrist Exp $
 
 inherit eutils autotools
 
@@ -22,7 +22,7 @@ src_unpack(){
 	epatch "${FILESDIR}"/${P}-ppc64-load_acquire.patch
 	epatch "${FILESDIR}"/${P}-ppc-asm.patch
 	epatch "${FILESDIR}"/${P}-sh4.patch
-
+	epatch "${FILESDIR}"/${P}-fix-makefile-am-generic.patch
 	eautoreconf
 }