I used the wrong order to create the patch, the as-needed one is applied before the...

Package-Manager: portage-2.1.2-r9

diff --git a/x11-libs/xforms/ChangeLog b/x11-libs/xforms/ChangeLog
index d8d8a5f2a86259611fe480c95b6c14b4291ae2c5..e36c785403ed6439a7184241125efd498a872627 100644 (file)
--- a/x11-libs/xforms/ChangeLog
+++ b/x11-libs/xforms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/xforms
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xforms/ChangeLog,v 1.38 2007/02/18 16:29:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xforms/ChangeLog,v 1.39 2007/02/20 16:21:05 phreak Exp $
+
+  20 Feb 2007; Christian Heim <phreak@gentoo.org>
+  files/xforms-1.0.90-Makefile.am.patch:
+  I used the wrong order to create the patch, the as-needed one is applied
+  before the Makefile.am one, so changes stuff in Makefile.am before the
+  Makefile patch is applied and breaks the latter one.
 
   18 Feb 2007; Fabian Groffen <grobian@gentoo.org> xforms-1.0.90-r1.ebuild:
   Dropped ppc-macos keyword, see you in prefix

diff --git a/x11-libs/xforms/Manifest b/x11-libs/xforms/Manifest
index 12795ed6c5ebd2654ba0952242f1772899825be7..74002be5092b6f026f44d270dda83b28414e03f4 100644 (file)
--- a/x11-libs/xforms/Manifest
+++ b/x11-libs/xforms/Manifest
@@ -1,7 +1,10 @@
-AUX xforms-1.0.90-Makefile.am.patch 624 RMD160 510de6efecaf6869d4ccadb73a62ac918569c17e SHA1 2d5b5a198c70b4e2db3cc202b74d6be3bf4751c9 SHA256 cb662693000b50317c93b323e013eb14120cbbbaddca826b6b427af4167c3f10
-MD5 1b5db3a39557b7655b42610acc9ec18a files/xforms-1.0.90-Makefile.am.patch 624
-RMD160 510de6efecaf6869d4ccadb73a62ac918569c17e files/xforms-1.0.90-Makefile.am.patch 624
-SHA256 cb662693000b50317c93b323e013eb14120cbbbaddca826b6b427af4167c3f10 files/xforms-1.0.90-Makefile.am.patch 624
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xforms-1.0.90-Makefile.am.patch 581 RMD160 c01d3290aa7d3ed186fb9ef31db92fc2593992b6 SHA1 38498aeb132d704a06ac440e003efcf488d83c8f SHA256 12f23e3281d99c44dcf407663cd2c9bc5d8d087029e99950af302d2e512c3d6c
+MD5 7415c80919f4516fc56b6990b18ce6bf files/xforms-1.0.90-Makefile.am.patch 581
+RMD160 c01d3290aa7d3ed186fb9ef31db92fc2593992b6 files/xforms-1.0.90-Makefile.am.patch 581
+SHA256 12f23e3281d99c44dcf407663cd2c9bc5d8d087029e99950af302d2e512c3d6c files/xforms-1.0.90-Makefile.am.patch 581
 AUX xforms-1.0.90-as-needed.patch 385 RMD160 d9ae84e4d606517d5d7117cd131657a8b935e411 SHA1 a0dadb93154d7a2125730e078b743c94ee1b9cf9 SHA256 4a29747c95550ec1dcf94ac657cc878434a6dca3f28c608692a4483fa4579d8a
 MD5 94734ab491bc0551335b85adf59c3e08 files/xforms-1.0.90-as-needed.patch 385
 RMD160 d9ae84e4d606517d5d7117cd131657a8b935e411 files/xforms-1.0.90-as-needed.patch 385
@@ -11,10 +14,10 @@ EBUILD xforms-1.0.90-r1.ebuild 1050 RMD160 b9fb2f289b597ae33863eb44abac9dad2bc1c
 MD5 599a9991955a9c3a04a2dab250cc8c93 xforms-1.0.90-r1.ebuild 1050
 RMD160 b9fb2f289b597ae33863eb44abac9dad2bc1cc85 xforms-1.0.90-r1.ebuild 1050
 SHA256 aee09036d6ab0db939bebaa16b5ddc6ac12089579a3d94602d0181a083b7f4de xforms-1.0.90-r1.ebuild 1050
-MISC ChangeLog 5663 RMD160 65f7cd2825debac19ad57ed7f18a40f865f1171d SHA1 1e2d81a49cacc61f78d24f7df0bdf6e2aa544dad SHA256 ef2ec3019d041f4937d0d8665dd00e58d11d9e7dc74d4e7cf85fda8cab2f3d60
-MD5 0069e5ca1885ec98664f491f5628215d ChangeLog 5663
-RMD160 65f7cd2825debac19ad57ed7f18a40f865f1171d ChangeLog 5663
-SHA256 ef2ec3019d041f4937d0d8665dd00e58d11d9e7dc74d4e7cf85fda8cab2f3d60 ChangeLog 5663
+MISC ChangeLog 5957 RMD160 db91eedfd5ac0623de1d71a2b811b70d13e25d4e SHA1 2eaf312a52ccc6233c23e28dc41708ace37b057c SHA256 c033b4150cc94e675021a941e06c4905f776cf412f76bc38ea68faee19f20c19
+MD5 aa0f2764cbcd4849bbc4ba1297fb788f ChangeLog 5957
+RMD160 db91eedfd5ac0623de1d71a2b811b70d13e25d4e ChangeLog 5957
+SHA256 c033b4150cc94e675021a941e06c4905f776cf412f76bc38ea68faee19f20c19 ChangeLog 5957
 MISC metadata.xml 232 RMD160 854b06094287201d0b98f2b21d36054db25d81cd SHA1 cc4f98e9ee0102aea687d71cf3af924cf156edbb SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df
 MD5 8e53a4e000887f6bb029ca30c434e207 metadata.xml 232
 RMD160 854b06094287201d0b98f2b21d36054db25d81cd metadata.xml 232
@@ -22,3 +25,10 @@ SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df metadata
 MD5 afcf2f517884a0625701fae2e6701627 files/digest-xforms-1.0.90-r1 241
 RMD160 d9b4b9fb2918440d012ebaf5bf7d8936ce58b176 files/digest-xforms-1.0.90-r1 241
 SHA256 19253961331922517f0e211774b7e3c79f5d772ebe12640eb78daad4a1d72557 files/digest-xforms-1.0.90-r1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF2x/3yuNVb5qfaOYRAskCAKCRziyCRnBmDn35ongRbUppCtjRuQCePpAe
+bj7Y9N0nTuQcYTlr5DaifJA=
+=O2O0
+-----END PGP SIGNATURE-----

diff --git a/x11-libs/xforms/files/xforms-1.0.90-Makefile.am.patch b/x11-libs/xforms/files/xforms-1.0.90-Makefile.am.patch
index 06de35ac6642e29d19636fcab7e3ee415d630b2d..629c0c408526c9988bad1a10df6cbb071b09c554 100644 (file)
--- a/x11-libs/xforms/files/xforms-1.0.90-Makefile.am.patch
+++ b/x11-libs/xforms/files/xforms-1.0.90-Makefile.am.patch
@@ -2,7 +2,7 @@ Index: xforms-1.0.90/fdesign/Makefile.am
 ===================================================================
 --- xforms-1.0.90.orig/fdesign/Makefile.am
 +++ xforms-1.0.90/fdesign/Makefile.am
-@@ -54,7 +54,3 @@ fdesign_SOURCES = \
+@@ -54,7 +54,3 @@
        sp_twheel.c \
        sp_xyplot.c \
        xpm.h
@@ -14,10 +14,10 @@ Index: xforms-1.0.90/lib/Makefile.am
 ===================================================================
 --- xforms-1.0.90.orig/lib/Makefile.am
 +++ xforms-1.0.90/lib/Makefile.am
-@@ -118,6 +118,3 @@ libforms_la_SOURCES = \
+@@ -119,6 +119,3 @@
        xsupport.c \
        xtext.c \
        xyplot.c
 -
 -#     dirent_vms.h \
--#     vms_readdir.c \
\ No newline at end of file
+-#     vms_readdir.c \