updated patch for confix to work with DESTDIR installs

Package-Manager: portage-2.1.4.5

4 files changed, 16 insertions, 9 deletions

diff --git a/dev-util/confix/ChangeLog b/dev-util/confix/ChangeLog
index c5bb13821f1e..18384cb66bf6 100644
--- a/dev-util/confix/ChangeLog
+++ b/dev-util/confix/ChangeLog
@@ -1,6 +1,13 @@
 # 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.7 2008/12/17 09:43:16 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/ChangeLog,v 1.8 2008/12/17 15:00:48 mduft Exp $
+
+*confix-2.1.0-r3 (17 Dec 2008)
+
+  17 Dec 2008; Markus Duft <mduft@gentoo.org>
+  files/2.1.0/fast-install.patch, -confix-2.1.0-r2.ebuild,
+  +confix-2.1.0-r3.ebuild:
+  updated patch for confix to work with DESTDIR installs; oops...
 
   17 Dec 2008; Markus Duft <mduft@gentoo.org>
   files/2.1.0/fast-install.patch:
diff --git a/dev-util/confix/Manifest b/dev-util/confix/Manifest
index 7e2b56eb6312..9f1cac22af5d 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 15080 RMD160 b7d5e26eb190def6aededcda89526f7490e28123 SHA1 72eaa022c6e8950ff8af6aaac9e5565aea22886b SHA256 cdebdfb1e5af237608fe32c291aa54a7b04fd013b20a921ed2ca29dcdea13593
+AUX 2.1.0/fast-install.patch 15125 RMD160 951259a32821621f969d34487e9cab24b146c82b SHA1 c159efb4dca9f85ab8c25968b7fde2f3f5fb7a09 SHA256 8f5fdb4135da14e034383b93dc9bf6de7ae069a013ed0a9f13228894acb07de4
 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-r2.ebuild 1685 RMD160 de43d615ddb537c1b7446616edef64fdeb36ae6c SHA1 244dde391a23a27df588fb27a3548d0e470d5ecf SHA256 4afa74a9c9995a229fc0ad4e3756d3a355091eeb65f2dfb2b46979a4b11fe5c7
+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 1323 RMD160 841b0c83b4b9fef193a87409a643c406822458db SHA1 ac559f0c3d8da4c3b52d6f3ea7b65dd586a19372 SHA256 1b73b15a5160b697c49d82315c88587a3027335df0c5a7bee36b5aad1ad4420e
+MISC ChangeLog 1554 RMD160 a70a0e0179ea4f8ffdbed151f99cabcfc1e082c1 SHA1 48f1962f79e2fdb1a68b61ffe50353ed4159d1a9 SHA256 8b309ff6e936ee2cd193c65e2dee9d82640fd20d1d076c1f994e97d5b1cec70c
 MISC metadata.xml 310 RMD160 8705c05dd91101641c0c967f040cf8c6de36f5e0 SHA1 255e1d97639f0f1698d667d23273797d05ac034d SHA256 05b48b7bd20b100b293a45dd84f1d9e7beeb52409327248b0d5ad242e0d9d2e5
diff --git a/dev-util/confix/confix-2.1.0-r2.ebuild b/dev-util/confix/confix-2.1.0-r3.ebuild
index f5e84ab8011e..9228a932b7c5 100644
--- a/dev-util/confix/confix-2.1.0-r2.ebuild
+++ b/dev-util/confix/confix-2.1.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/confix-2.1.0-r2.ebuild,v 1.1 2008/12/09 08:30:18 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/confix-2.1.0-r3.ebuild,v 1.1 2008/12/17 15:00:48 mduft Exp $
 
 inherit distutils
 
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 4db79b837991..f64582579bab 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 10:35:54 +0100
++++ Confix-2.1.0/libconfix/core/automake/file_installer.py	2008-12-17 11:58:32 +0100
 @@ -22,6 +22,11 @@
  from libconfix.core.utils.paragraph import Paragraph
  from libconfix.core.utils import const
@@ -95,7 +95,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.
 +                if len(_f) >= FileInstaller.MAX_SIMULTANOUS_INSTALL or _i >= len(files):
 +                    # is this rule name unique enough?
 +                    rulename='.installstamp.public_' + my_md5(str(hash(self)) + targetdir + str(_i)).hexdigest()
-+                    self.fast_general_install(makefile_am, rulename, targetdir, _f, '0644')
++                    self.fast_general_install(makefile_am, rulename, '$(DESTDIR)' + targetdir, _f, '0644')
 +                    install_public_rule.add_prerequisite(rulename)
 +                    uninstall_public_rule.add_prerequisite(rulename + '_clean')
 +                    _f=[]
@@ -147,7 +147,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.
 +                if len(_f) >= FileInstaller.MAX_SIMULTANOUS_INSTALL or _i >= len(files):
 +                    # is this rule name unique enough?
 +                    rulename='.installstamp.public_data_' + my_md5(str(hash(self)) + targetdir + str(_i)).hexdigest()
-+                    self.fast_general_install(makefile_am, rulename, targetdir, _f, '0644')
++                    self.fast_general_install(makefile_am, rulename, '$(DESTDIR)' + targetdir, _f, '0644')
 +                    install_public_data_rule.add_prerequisite(rulename)
 +                    uninstall_public_data_rule.add_prerequisite(rulename + '_clean')
 +                    _f=[]
@@ -200,7 +200,7 @@ diff -ru Confix-2.1.0.orig/libconfix/core/automake/file_installer.py Confix-2.1.
 +                if len(_f) >= FileInstaller.MAX_SIMULTANOUS_INSTALL or _i >= len(files):
 +                    # is this rule name unique enough?
 +                    rulename='.installstamp.public_prefix_' + my_md5(str(hash(self)) + targetdir + str(_i)).hexdigest()
-+                    self.fast_general_install(makefile_am, rulename, targetdir, _f, '0644')
++                    self.fast_general_install(makefile_am, rulename, '$(DESTDIR)' + targetdir, _f, '0644')
 +                    install_public_prefix_rule.add_prerequisite(rulename)
 +                    uninstall_public_prefix_rule.add_prerequisite(rulename + '_clean')
 +                    _f=[]