Replace custom autotools handling with the use of autotools eclass, remove ppc-macos conditionals. Append -fno-strict-aliasing as this package has rules breakage.

Package-Manager: portage-2.1.1_pre1-r5

3 files changed, 36 insertions, 26 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 75332e86acd9..93737bdb149f 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.124 2006/06/27 18:02:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.125 2006/06/29 09:54:07 flameeyes Exp $
+
+  29 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  openmotif-2.2.3-r9.ebuild:
+  Replace custom autotools handling with the use of autotools eclass, remove
+  ppc-macos conditionals. Append -fno-strict-aliasing as this package has
+  rules breakage.
 
   27 Jun 2006; Stefan Schweizer <genstef@gentoo.org> metadata.xml,
   -openmotif-2.1.30-r13.ebuild, openmotif-2.2.3-r3.ebuild,
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 15e65137f98b..87dab205a7cf 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX CAN-2005-0605.patch 1118 RMD160 56a1a4433bb71d54b6d5df33fab68aca74158730 SHA1 f9198a5629998790c2dfd112f71134f39f4b3e11 SHA256 20517fc5c4b61419528b658422fdcc9ed972762cffd605a844a4cfd1f628a331
 MD5 b38be118160b49f6b0f9e31d26f01594 files/CAN-2005-0605.patch 1118
 RMD160 56a1a4433bb71d54b6d5df33fab68aca74158730 files/CAN-2005-0605.patch 1118
@@ -114,14 +117,14 @@ EBUILD openmotif-2.2.3-r8.ebuild 3956 RMD160 25e7e3f2da82eea0dda62dad20978365018
 MD5 504a84a578622aaed789564734d75243 openmotif-2.2.3-r8.ebuild 3956
 RMD160 25e7e3f2da82eea0dda62dad20978365018b5a76 openmotif-2.2.3-r8.ebuild 3956
 SHA256 b4f2c93e77be5583faa69e95a04178341a88150915bec405ceeded809d906f43 openmotif-2.2.3-r8.ebuild 3956
-EBUILD openmotif-2.2.3-r9.ebuild 3957 RMD160 a5471d769351c0e4194adc5eaba762c532648f49 SHA1 c091144375620d1e81d269791ba7fb7b1d8a20dc SHA256 22e3d748e314e48442043c13d6f6000db3811de12ce8a60fe34eae93b82263b4
-MD5 d90f4b35e6884e6b6db20abb6d4967d2 openmotif-2.2.3-r9.ebuild 3957
-RMD160 a5471d769351c0e4194adc5eaba762c532648f49 openmotif-2.2.3-r9.ebuild 3957
-SHA256 22e3d748e314e48442043c13d6f6000db3811de12ce8a60fe34eae93b82263b4 openmotif-2.2.3-r9.ebuild 3957
-MISC ChangeLog 18799 RMD160 c79fdc72f15713b6557993f0fa80c0cc7260fd71 SHA1 83b85b3b98e4ce9df7823cd531b3580b6f92600e SHA256 d77b78c99c90f7926fe1583bcf2acddc4a45e6128490ea7ab734a54c0008f79d
-MD5 1c431c446c0556d99641ccf9a4434349 ChangeLog 18799
-RMD160 c79fdc72f15713b6557993f0fa80c0cc7260fd71 ChangeLog 18799
-SHA256 d77b78c99c90f7926fe1583bcf2acddc4a45e6128490ea7ab734a54c0008f79d ChangeLog 18799
+EBUILD openmotif-2.2.3-r9.ebuild 3828 RMD160 9277d6e99a1d5cdb98cc12463627ebc1fcf8c71b SHA1 f9534f6dc748707e926408197314246de88cf916 SHA256 88b096d6eddd5bd59f5a172f2f480a8c551244df38e0c3c1f3ae7aa749555319
+MD5 970296143507c74e04402ceef2d9fd21 openmotif-2.2.3-r9.ebuild 3828
+RMD160 9277d6e99a1d5cdb98cc12463627ebc1fcf8c71b openmotif-2.2.3-r9.ebuild 3828
+SHA256 88b096d6eddd5bd59f5a172f2f480a8c551244df38e0c3c1f3ae7aa749555319 openmotif-2.2.3-r9.ebuild 3828
+MISC ChangeLog 19053 RMD160 8a4351f32f5f6093e9e99e64b4c544eddce1085d SHA1 21de68ebf74363f795b610ca69882c907f9f40f1 SHA256 0a5ee23a5843fa33a099b6e473217364a54dd91ec78252abc6900cffac4bbf13
+MD5 ccdc9421156a0d36f4c1dc5ba26e2bbd ChangeLog 19053
+RMD160 8a4351f32f5f6093e9e99e64b4c544eddce1085d ChangeLog 19053
+SHA256 0a5ee23a5843fa33a099b6e473217364a54dd91ec78252abc6900cffac4bbf13 ChangeLog 19053
 MISC metadata.xml 170 RMD160 0c6b102787098d03cbf0bdbed37dabbd0de6654e SHA1 ba2300f5740c3b005419388cec650037e927799f SHA256 53b07ee8fc55e6e45232b2d798d00da0d1056ef3f963816e46b410bbdb676623
 MD5 a62858e8c9d87aaaaa3356a1c94ef18d metadata.xml 170
 RMD160 0c6b102787098d03cbf0bdbed37dabbd0de6654e metadata.xml 170
@@ -141,3 +144,10 @@ SHA256 4333e38dae316879724e878cafd5d5477975edfe50134b36cec4ddf40c0eecc6 files/di
 MD5 e38a0e0825238206da7e31703f5eb0a3 files/digest-openmotif-2.2.3-r9 563
 RMD160 7d060c5bbe733493b9e67db1a864923c2bb35013 files/digest-openmotif-2.2.3-r9 563
 SHA256 4333e38dae316879724e878cafd5d5477975edfe50134b36cec4ddf40c0eecc6 files/digest-openmotif-2.2.3-r9 563
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEo6NGAiZjviIA2XgRAqXIAKDVtPudaNJ3MDF31WbG1W5D87RPjQCglLQn
+k0tQny1tFq60DIpEZiCV9ec=
+=PfJt
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild
index 0d021610bd79..795f781bf70d 100644
--- a/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild,v 1.5 2006/06/27 18:04:20 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild,v 1.6 2006/06/29 09:54:07 flameeyes Exp $
 
-inherit eutils libtool flag-o-matic multilib
+inherit eutils libtool flag-o-matic multilib autotools
 
 MY_P=${P/m/M}
 S=${WORKDIR}/${MY_P}
@@ -60,23 +60,15 @@ src_unpack() {
 	epatch ${FILESDIR}/CAN-2005-0605.patch
 	epatch ${FILESDIR}/openmotif-2.2.3-uil.patch
 
-	use ppc-macos && epatch ${FILESDIR}/${P}-automake.patch
+	epatch ${FILESDIR}/${P}-automake.patch
 
-	# autotool stuff
-	export WANT_AUTOCONF=2.5
+	# This replaces deprecated, obsoleted and now invalid AC_DEFINE
+	# with their proper alternatives.
+	sed -i -e 's:AC_DEFINE(\([^)]*\)):AC_DEFINE(\1, [], [\1]):g' \
+		"${S}/configure.in" "${S}/acinclude.m4"
 
-	# Patched Makefile.am to work with version 1.6 on ppc-macos.
-	# Untested elsewhere
-	use ppc-macos || export WANT_AUTOMAKE=1.4
-
-	libtoolize --force --copy
-	aclocal || die
-	AUTOMAKE_OPTS="--foreign"
-	# For some reason ppc-macos complains about missing depcomp and compile
-	# files
-	use ppc-macos && AUTOMAKE_OPTS="-a -c -f ${AUTOMAKE_OPTS}"
-	automake ${AUTOMAKE_OPTS} || die
-	autoconf || die
+	# automake 1.4 is giving problems.
+	WANT_AUTOMAKE="1.6" eautoreconf
 }
 
 
@@ -87,6 +79,8 @@ src_compile() {
 	# bug #80421
 	filter-flags -ftracer
 
+	append-flags -fno-strict-aliasing
+
 	econf --with-x || die "configuration failed"
 
 	emake -j1 || die "make failed, if you have lesstif installed removed it, compile openmotif and recompile lesstif"