corrected minor issue with fast-install patch.

Package-Manager: portage-2.1.4.5

3 files changed, 13 insertions, 10 deletions

diff --git a/dev-util/confix/ChangeLog b/dev-util/confix/ChangeLog
index 18384cb66bf6..de12d584f5f9 100644
--- a/dev-util/confix/ChangeLog
+++ b/dev-util/confix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/confix
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/ChangeLog,v 1.8 2008/12/17 15:00:48 mduft Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/ChangeLog,v 1.9 2009/01/26 14:08:47 mduft Exp $
+
+  26 Jan 2009; Markus Duft <mduft@gentoo.org>
+  files/2.1.0/fast-install.patch:
+  corrected minor issue with fast-install patch.
 
 *confix-2.1.0-r3 (17 Dec 2008)
 
diff --git a/dev-util/confix/Manifest b/dev-util/confix/Manifest
index 9f1cac22af5d..0b715563bcd1 100644
--- a/dev-util/confix/Manifest
+++ b/dev-util/confix/Manifest
@@ -1,11 +1,11 @@
 AUX 2.1.0/CALL_RESCAN_HACK.patch 1903 RMD160 5d39086ec359febe718ac01e74ab2c66618710e9 SHA1 10be6be55790b20ddd8839663428389c84b392ec SHA256 32a5ef51215a3694a6c1f9a2f86501c1f931d508ae1f2e0d7ef1a2165cbaf6d7
 AUX 2.1.0/exeext.patch 853 RMD160 a74991889f13ae4ac9c693a31a3cac45c3369c64 SHA1 fed309c4a92a316d75145426566abca547725d95 SHA256 8acfacd280fcc61506078f54ad4a15b31514272ec61d50296eeed77f9f8bfc50
 AUX 2.1.0/ext-ac-archive.patch 1219 RMD160 132c5f93b6ab7bb6180e3387ae2c0053e988f6e6 SHA1 e46fa3c669fabcbac9fb425645e30c29765e880e SHA256 93869837ba4c9430cd1f4997f7a446a43f294c28b2bb74018574d33ff9acfbc8
-AUX 2.1.0/fast-install.patch 15125 RMD160 951259a32821621f969d34487e9cab24b146c82b SHA1 c159efb4dca9f85ab8c25968b7fde2f3f5fb7a09 SHA256 8f5fdb4135da14e034383b93dc9bf6de7ae069a013ed0a9f13228894acb07de4
+AUX 2.1.0/fast-install.patch 15068 RMD160 2896a18ac2cc205d8e131cfb0185e4b92d657648 SHA1 86c7ffd5211de188cc7a93f402614876f8e52f25 SHA256 167d627f774e5cb48b2ff7012f2ef42b1b27b50c3e6c9c2b63dccca8955a3ce7
 AUX 2.1.0/jni-hpux.patch 461 RMD160 ceb81eab19f5ad68cbfea6e0a222396e568ee04f SHA1 1d106059b0c5af376dc63fa39c95a98d27acd7f7 SHA256 7b53466e987f738a34adaca8cbd8266265f43985ba7bddb02f100f068ca946e3
 AUX 2.1.0/private-headers.patch 1685 RMD160 b15e70c2f3bad3205b6ae6b6627dc9167eb46945 SHA1 e0614dc7a80f573cd4c5119775d7e2929d90ffe6 SHA256 a47b77fb37677b7e3faa8d5e5d15c9cadf1546103f069c84b75f28dcda0fc873
 DIST Confix-2.1.0.tar.bz2 977383 RMD160 f83dc809b674cf7cfc78ad2a6a843c8bba9cc43a SHA1 837a8db0ca59c451289661f012eb227ccc8fda08 SHA256 ba4c4278e6bf1bf74503935fb394a2c045d122afebde52d863b040fba6e7104f
 EBUILD confix-2.1.0-r3.ebuild 1685 RMD160 8c107011693a1e489fdbaffb1cae647bec2a84a0 SHA1 8dfd8daa0664900c442f9d46108a139f1916d4a1 SHA256 e869f84d3a5bb17dd5063f515d6740e9636a0da49626e44ee7d8ff75a40c47b5
 EBUILD confix-2.1.0.ebuild 1487 RMD160 4bb8e31cfc4bb639c03f4b3d81799e770dae3931 SHA1 86548c173643c70888cff9838466fb4ea7d0ddda SHA256 d3fa0ea2e60e8304555d284eff41bad742722c75df39f1ba85ad13f2552691f7
-MISC ChangeLog 1554 RMD160 a70a0e0179ea4f8ffdbed151f99cabcfc1e082c1 SHA1 48f1962f79e2fdb1a68b61ffe50353ed4159d1a9 SHA256 8b309ff6e936ee2cd193c65e2dee9d82640fd20d1d076c1f994e97d5b1cec70c
+MISC ChangeLog 1684 RMD160 f83d6bae203a1a13c7146e58d9bed3b0d7d4bbda SHA1 d46fb8f1f98a5d4cb4c9b147763209af43891a97 SHA256 7f8c2ff792459cb99b1a0957086b0422486fd7e93aa0b453600798d170616d2c
 MISC metadata.xml 310 RMD160 8705c05dd91101641c0c967f040cf8c6de36f5e0 SHA1 255e1d97639f0f1698d667d23273797d05ac034d SHA256 05b48b7bd20b100b293a45dd84f1d9e7beeb52409327248b0d5ad242e0d9d2e5
diff --git a/dev-util/confix/files/2.1.0/fast-install.patch b/dev-util/confix/files/2.1.0/fast-install.patch
index f64582579bab..0c3778ae7f73 100644
--- a/dev-util/confix/files/2.1.0/fast-install.patch
+++ b/dev-util/confix/files/2.1.0/fast-install.patch
@@ -1,6 +1,6 @@
 diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.0/libconfix/core/automake/file_installer.py
 --- Confix-2.1.0.orig/libconfix/core/automake/file_installer.py	2008-10-21 11:17:30 +0200
-+++ Confix-2.1.0/libconfix/core/automake/file_installer.py	2008-12-17 11:58:32 +0100
++++ Confix-2.1.0/libconfix/core/automake/file_installer.py	2009-01-26 15:02:50 +0100
 @@ -22,6 +22,11 @@
  from libconfix.core.utils.paragraph import Paragraph
  from libconfix.core.utils import const
@@ -159,7 +159,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.
      def automake_install_prefixfiles_(self, makefile_am):
          for dirname, filelist in self.dir2filedict_(file2dirdict=self.prefixfiles_).iteritems():
              # define directory
-@@ -291,17 +401,93 @@
+@@ -291,17 +401,92 @@
              pass
          pass
  
@@ -232,12 +232,11 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.
 +                           'done; \\',
 +						   'test -z "$${__f}" && exit 0; \\',
 +                           'cp -fp $${__f} ' + targetdir + ' || exit 1; \\',
-+                           'chmod ' + mode + ' $${__tf} || exit 1; \\',
-+						   'touch ' + rulename + ';']))
++                           'chmod ' + mode + ' $${__tf} || exit 1;']))
 +        makefile_am.add_element(
 +            Rule(targets=[rulename + '_clean'],
 +                 prerequisites=[],
-+                 commands=['rm -f ' + rulename + ' ' + str(' ' + targetdir + '/').join([''] + files) + ';']))
++                 commands=['rm -f ' + str(' ' + targetdir + '/').join([''] + files) + ';']))
 +        pass
 +
 +    def fast_install_private_headers_(self, makefile_am):
@@ -258,7 +257,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.
          makefile_am.add_element(install_local_rule)        
          makefile_am.add_element(clean_local_rule)
  
-@@ -321,20 +507,37 @@
+@@ -321,20 +506,37 @@
                       commands=['-$(mkinstalldirs) '+targetdir]))
  
              # copy files