Stable on hppa. Fix #127924 and unexpected relocs 0x42.

Package-Manager: portage-2.0.54

4 files changed, 10 insertions, 12 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index f680b9f9d5e7..5de4734586b1 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.223 2006/04/01 17:20:30 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.224 2006/04/02 21:08:59 gmsoft Exp $
+
+  02 Apr 2006; Guy Martin <gmsoft@gentoo.org> samba-3.0.22.ebuild:
+  Stable on hppa. Fix #127924 and unexpected relocs 0x42.
 
   01 Apr 2006; Markus Rothe <corsair@gentoo.org> samba-3.0.21c-r1.ebuild:
   Stable on ppc64; bug #127924
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 427522699845..2b14bd809388 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,4 +1,4 @@
-MD5 4eb3bd0b06b8dfa170ddeff6b301a673 ChangeLog 39332
+MD5 739bd5e1602aa2f9205c0c5a75bf0e6f ChangeLog 39457
 MD5 7cbe28bc9f7e821c88c4f80c39752eb5 files/035_all_samba-3.0.21-winbind_log.patch 438
 MD5 4909031b1d1c775a746e4804997c65ce files/README.gentoo 2682
 MD5 8655ff25f25d7e80f85a5e527d43e94b files/digest-samba-3.0.14a-r2 209
@@ -11,7 +11,7 @@ MD5 dc35f89eee1482d5d66160435a4ed501 files/digest-samba-3.0.21b 771
 MD5 adb7ab134c8c36d103e72cf1b41c3255 files/digest-samba-3.0.21b-r1 771
 MD5 064044b71a87a5fd0d0a9991b291f1aa files/digest-samba-3.0.21c 771
 MD5 064044b71a87a5fd0d0a9991b291f1aa files/digest-samba-3.0.21c-r1 771
-MD5 1463ff1b83a8b87658e88d95b1f74493 files/digest-samba-3.0.22 768
+MD5 bf7c81fad7bea6b6fbb5d6fdee4695b1 files/digest-samba-3.0.22 210
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
 MD5 61f0df98191ae242f294459ac9eee7e7 samba-3.0.14a-r2.ebuild 9269
 MD5 b342ed3ffe76e40848625e839ed5820c samba-3.0.14a-r3.ebuild 9280
@@ -23,4 +23,4 @@ MD5 3f52053c36d38ea2153225d8c6f3f736 samba-3.0.21b-r1.ebuild 8717
 MD5 1f09216095d15cd2d95220aca4730b6c samba-3.0.21b.ebuild 8612
 MD5 3e03c846184396b342ea840fe7a4b5af samba-3.0.21c-r1.ebuild 8718
 MD5 5c77ef195240c56181d7e72fbbc26163 samba-3.0.21c.ebuild 8614
-MD5 710670af78f73412e0ece2eb72a39643 samba-3.0.22.ebuild 8638
+MD5 ef7585d0e94141832d897dd30259d476 samba-3.0.22.ebuild 8684
diff --git a/net-fs/samba/files/digest-samba-3.0.22 b/net-fs/samba/files/digest-samba-3.0.22
index 89a82f875b68..80a673455318 100644
--- a/net-fs/samba/files/digest-samba-3.0.22
+++ b/net-fs/samba/files/digest-samba-3.0.22
@@ -1,9 +1,3 @@
 MD5 e68da25c1ff30482c9401e279ae62797 samba-3-gentoo-0.3.11.tar.bz2 15929
-RMD160 2ad449ab8ceddb2d2f940eaebdab7965925038c5 samba-3-gentoo-0.3.11.tar.bz2 15929
-SHA256 8c6de0f26458995b8d095ddc433caac8b183fbc6e5f9cbc240cb762ae3c1f3da samba-3-gentoo-0.3.11.tar.bz2 15929
 MD5 5c39505af17cf5caf3d6ed8bab135036 samba-3.0.22.tar.gz 17542657
-RMD160 b41cffc999c524c1650d2dd3fbd063dc79741091 samba-3.0.22.tar.gz 17542657
-SHA256 781466885804343248afb74dfdd57df0c7165b252ded06a71c0f24827b2a8e2d samba-3.0.22.tar.gz 17542657
 MD5 900502ba36b80620229b94e5129bc856 samba-vscan-0.3.6b.tar.bz2 164471
-RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b samba-vscan-0.3.6b.tar.bz2 164471
-SHA256 2fa680c85ef036a9ac27d1039807881c7a0f35f64f731b1d3a13b860a9135e7a samba-vscan-0.3.6b.tar.bz2 164471
diff --git a/net-fs/samba/samba-3.0.22.ebuild b/net-fs/samba/samba-3.0.22.ebuild
index d36526b31b8e..1294b58405a8 100644
--- a/net-fs/samba/samba-3.0.22.ebuild
+++ b/net-fs/samba/samba-3.0.22.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-fs/samba/samba-3.0.22.ebuild,v 1.1 2006/03/31 08:17:42 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.22.ebuild,v 1.2 2006/04/02 21:08:59 gmsoft Exp $
 
 inherit eutils versionator
 
@@ -26,7 +26,7 @@ SRC_URI="mirror://samba/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="dev-libs/popt
 	acl?       ( sys-apps/acl )
@@ -99,6 +99,7 @@ src_compile() {
 	use winbind && myconf="${myconf} $(use_with winbind) --with-shared-modules=idmap_rid"
 
 	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
+	use hppa && myconf="${myconf} --disable-pie"
 
 	econf \
 		--with-fhs \