Move epatch commands together.

Package-Manager: portage-2.2_rc65/cvs/Linux i686

diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index b371224733fbdfeb17709bc33a8374a9715297fe..a77886058bff547caaf300616018e1e5880760c7 100644 (file)
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Mwm.defaults 536 RMD160 99fc40c2e923b53a14b2911c37064f2c9cd3f63b SHA1 ddbe7ab7af3a8caf6ccb9d6ab2c721ce5940edd1 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250
 AUX openmotif-2.3.1-ac-editres.patch 358 RMD160 2bace990711052d7d26a405aa63d6696a33ca50c SHA1 a83e8567f5bc9998f9cbdfbfafce007ac44009a8 SHA256 6ef38a5a3532e3a8d6be85549026410340da0d98aa97dd683aeb70eb5b9c5d52
 AUX openmotif-2.3.1-multilist-stipple.patch 819 RMD160 756e0a20223b157f127197c74c5d71087a06c51f SHA1 c81c77fa9c47f463a851f3591ba9f370c4c7a347 SHA256 2ccc3b9292eb8a2f6eab49198ea54f51bc243d14b64b4bd07aea6712526dd828
@@ -8,7 +11,14 @@ AUX openmotif-2.3.2-sanitise-paths.patch 734 RMD160 de091a0b8d232fc4507c9fc3b380
 AUX openmotif-2.3.2-solaris-2.11.patch 409 RMD160 78e04d1ea6985b663423058754b6d05fdacdf88d SHA1 dc19563eada1094f921d69d0415cdf643697e0a5 SHA256 cfd6f6dde2edd3907b3dc712d2df2096478b20ca4d4dc523b45058c50656a0b7
 DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd1ef5db5a395 SHA1 1d0f55928ad65ee321564ba962b1608cfd83bb96 SHA256 49692fd4d5441d2dbb5ca36199b209c8503452fda9b36e929d1aa3673bffaecb
 DIST openmotif-2.3.2.tar.gz 5941784 RMD160 2346a93fcec57b9c18b6657d1cc681b6001cba28 SHA1 c98ac1bf3640ce57da34a0704bdeb2b12011ae1f SHA256 f786f3724d33133e8c4b3c9b368c89d680e981ca1c0e8c3280f496976b390c7d
-EBUILD openmotif-2.3.2-r2.ebuild 5240 RMD160 1b78c30fc2bc4b23aa4f36006e6fa891ad41967b SHA1 f8b66563e0f5339883a7386398d5471fde4d0038 SHA256 cd662b97b37be225ccb7d13373f21edeb1f11ceb4e13f24ea70ba7f5b5a91fe4
+EBUILD openmotif-2.3.2-r2.ebuild 5241 RMD160 640a7c57ef3b467b8ab7aed19c4445baaa4a483d SHA1 b29ee5792c926de2b602bcbca6faeab11a140da4 SHA256 65f451324489f9b6be1b0dbb65af6f88b653d13015be5ae334bd1e27687d3dca
 EBUILD openmotif-2.3.2.ebuild 4084 RMD160 7bb056c12a1856bd954b1bc614c812745dd8e4d9 SHA1 c4f85b4050c4bfea88ba4c0f5df156cb94848ad2 SHA256 f6aa28e3b4bb6104ad52d0d487b0083c96f1a871c3603c125b31d1a0f5562f0e
 MISC ChangeLog 34642 RMD160 738bc387824f40e861d2e0c2a9c9d61f2b7605c4 SHA1 6f6081a499fcb05f6ef79428605f399d9fe88a8e SHA256 4e717ac9a184cb1e853567da2b4c25378025bc0f2058732be7651dd050bce710
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuVLLUACgkQOeoy/oIi7uzKkACfcaEczm9QtcJ27LlP+Av6gEZp
+TxcAoN4bWCmD67NDXPkwJFiNxogxe063
+=hqR/
+-----END PGP SIGNATURE-----

diff --git a/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild b/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
index 71ecce326319acca0f6d9e72ef20c8bd138ab266..d42f5366129eb1e794c49cbe5b8ffb6fa949a3cc 100644 (file)
--- a/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.2-r2.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/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild,v 1.4 2010/03/08 13:41:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild,v 1.5 2010/03/08 16:58:09 ulm Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ LICENSE="MOTIF MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples jpeg png unicode xft"
-# license allows usage only on "open source operating systems"
+# license allows distribution only for "open source operating systems"
 RESTRICT="!kernel_linux? (
        !kernel_FreeBSD? (
        !kernel_Darwin? (
@@ -86,6 +86,7 @@ src_prepare() {
        epatch "${FILESDIR}/${P}-ldflags.patch" #293573
        epatch "${FILESDIR}/${P}-ddd-layout.patch" #303887
        epatch "${FILESDIR}/${P}-sanitise-paths.patch"
+       epatch "${FILESDIR}/${P}-libpng14.patch"
        [[ ${CHOST} == *-solaris2.11 ]] \
                && epatch "${FILESDIR}/${P}-solaris-2.11.patch"
 
@@ -95,8 +96,6 @@ src_prepare() {
        # add X.Org vendor string to aliases for virtual bindings
        echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
 
-       epatch "${FILESDIR}"/${P}-libpng14.patch
-
        AT_M4DIR=. eautoreconf
 }