added live svn ebuild for upcoming confix-2.2

Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 124 insertions, 2 deletions

diff --git a/dev-util/confix/ChangeLog b/dev-util/confix/ChangeLog
index 6c1f98600912..b0f9a5535d53 100644
--- a/dev-util/confix/ChangeLog
+++ b/dev-util/confix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/confix
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/ChangeLog,v 1.10 2009/10/16 08:18:00 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/ChangeLog,v 1.11 2009/11/03 17:08:59 mduft Exp $
+
+*confix-9999 (03 Nov 2009)
+
+  03 Nov 2009; Markus Duft <mduft@gentoo.org> +files/2.2.0/exeext.patch,
+  +confix-9999.ebuild, +files/2.2.0/ext-ac-archive.patch:
+  added live ebuild for new confix-2.2
 
   16 Oct 2009; Michael Haubenwallner <haubi@gentoo.org>
   confix-2.1.0-r3.ebuild:
diff --git a/dev-util/confix/Manifest b/dev-util/confix/Manifest
index e16456f3df12..9353634717e8 100644
--- a/dev-util/confix/Manifest
+++ b/dev-util/confix/Manifest
@@ -4,8 +4,11 @@ AUX 2.1.0/ext-ac-archive.patch 1219 RMD160 132c5f93b6ab7bb6180e3387ae2c0053e988f
 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
+AUX 2.2.0/exeext.patch 890 RMD160 52223f7adfe5f20c045517b20f2bb6e43da0bcf4 SHA1 ec0546cdb44eb3899539e3a4254b9639b9513c80 SHA256 eeb76fd3eddc2665f9cbbc4379c0d75e5e9c2e6363bf7f3157e6c81c997dfd15
+AUX 2.2.0/ext-ac-archive.patch 1515 RMD160 1aa84c6e3a1259447289ed4cc8fa93e7dba1bc86 SHA1 ed015add7286b176f12590cbd8dbbb8da9a7560d SHA256 6713126639eaffa18ec22d5c7c4e3091b0bf3efa7a7d2c9b9011a7b6e95be99d
 DIST Confix-2.1.0.tar.bz2 977383 RMD160 f83dc809b674cf7cfc78ad2a6a843c8bba9cc43a SHA1 837a8db0ca59c451289661f012eb227ccc8fda08 SHA256 ba4c4278e6bf1bf74503935fb394a2c045d122afebde52d863b040fba6e7104f
 EBUILD confix-2.1.0-r3.ebuild 1738 RMD160 e4f1594e0a67813bad2d538095640dc403c88ef0 SHA1 8732a3a81821ab5292cbbb94aa1970779288d234 SHA256 5a5650256f941c1613bff6a7c3e3ecde16c857f656c4d4dc4732cec7d128aaa6
 EBUILD confix-2.1.0.ebuild 1487 RMD160 4bb8e31cfc4bb639c03f4b3d81799e770dae3931 SHA1 86548c173643c70888cff9838466fb4ea7d0ddda SHA256 d3fa0ea2e60e8304555d284eff41bad742722c75df39f1ba85ad13f2552691f7
-MISC ChangeLog 1863 RMD160 82b6bf4eaf82a8f8753899ddbfd0cfc0b29fa280 SHA1 ef03291d80dfe5ecca265417625098cbadf7f580 SHA256 866b1ed5f445bf720686b5f66338d0eca5281d2b2a466c0ef70dbad74eac62f8
+EBUILD confix-9999.ebuild 1831 RMD160 eb2ae3d467df993ce761130407ee620ca448e8d6 SHA1 14ba4d08a8a153b886158d918625ad921e447161 SHA256 6888b46c0b1ce34bf581b33c4c8fc50b027605ba6b77031fc580fb251a0858ef
+MISC ChangeLog 2062 RMD160 825150f753658f9653fcbbdac3bdfaabfa1d8f77 SHA1 6bc857b4c86784f17941758d7d4a4e78e7ccc4d3 SHA256 143fb387db3c647d7a58b010c816074de11e637f1211d1c1986ae272d99a5b0e
 MISC metadata.xml 310 RMD160 8705c05dd91101641c0c967f040cf8c6de36f5e0 SHA1 255e1d97639f0f1698d667d23273797d05ac034d SHA256 05b48b7bd20b100b293a45dd84f1d9e7beeb52409327248b0d5ad242e0d9d2e5
diff --git a/dev-util/confix/confix-9999.ebuild b/dev-util/confix/confix-9999.ebuild
new file mode 100644
index 000000000000..ed40c4f5b255
--- /dev/null
+++ b/dev-util/confix/confix-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/confix-9999.ebuild,v 1.1 2009/11/03 17:08:59 mduft Exp $
+
+EAPI=2
+
+inherit distutils subversion
+
+DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
+HOMEPAGE="http://confix.sourceforge.net"
+
+ESVN_REPO_URI="https://confix.svn.sourceforge.net/svnroot/confix/confix/trunk"
+ESVN_PROJECT="${PN}"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}
+	sys-devel/automake
+	sys-devel/libtool
+	sys-devel/autoconf-archive
+	dev-util/confix-wrapper
+"
+
+PYTHON_MODNAME="libconfix tests"
+
+src_prepare() {
+	# find jni-include dirs on hpux.
+	epatch "${FILESDIR}"/2.1.0/jni-hpux.patch
+	# hack to ignore duplicate files in rescan
+# does not apply to trunk anymore
+#	epatch "${FILESDIR}"/2.1.0/CALL_RESCAN_HACK.patch
+	# add .exe extension to TESTS
+	epatch "${FILESDIR}"/2.2.0/exeext.patch
+	# use external autoconf archive
+	epatch "${FILESDIR}"/2.2.0/ext-ac-archive.patch
+	# enable SET_FILE_PROPERTIES(file, { 'PRIVATE_CINCLUDE', 1 })
+# does not apply to trunk anymore
+#	epatch "${FILESDIR}"/2.1.0/private-headers.patch
+	# enable fast installation rules.
+# does not apply to trunk anymore
+#	epatch "${FILESDIR}"/2.1.0/fast-install.patch
+
+	# need to store repos in exact versioned share/confix-PV/repo
+	sed -i -e "s,'confix2','confix-${PV}'," \
+		libconfix/plugins/automake/repo_automake.py \
+		libconfix/core/machinery/repo.py \
+	|| die "cannot adjust repo dir"
+
+	# adjust version-printing to have same version as share/confix-PV/repo,
+	# to ease revdep-rebuild-alike scripts for rebuilding confix-packages.
+	sed -i -e "/^CONFIX_VERSION[ 	]*=/s,.*,CONFIX_VERSION = '${PV}'," \
+		libconfix/core/utils/const.py \
+	|| die "cannot adjust confix version"
+}
diff --git a/dev-util/confix/files/2.2.0/exeext.patch b/dev-util/confix/files/2.2.0/exeext.patch
new file mode 100644
index 000000000000..98576f5c9f8b
--- /dev/null
+++ b/dev-util/confix/files/2.2.0/exeext.patch
@@ -0,0 +1,20 @@
+diff -ru confix-9999.orig/libconfix/plugins/automake/makefile_am.py confix-9999/libconfix/plugins/automake/makefile_am.py
+--- confix-9999.orig/libconfix/plugins/automake/makefile_am.py	2009-10-30 13:20:42.106291175 +0100
++++ confix-9999/libconfix/plugins/automake/makefile_am.py	2009-10-30 13:23:39.562354663 +0100
+@@ -472,7 +472,15 @@
+         
+         # register automatic tests and set their environment
+ 
+-        tests = self.dir_primary('check', 'PROGRAMS') + \
++        test_tmp = self.dir_primary('check', 'PROGRAMS')
++        count = 0
++        for prog in test_tmp:
++            prog += "$(EXEEXT)"
++            test_tmp[count] = prog
++            count += 1
++            pass
++
++        tests = test_tmp + \
+                 self.dir_primary('check', 'SCRIPTS')
+         if len(tests):
+             lines.extend(makefile.List(name='TESTS', values=tests, mitigate=True).lines())
diff --git a/dev-util/confix/files/2.2.0/ext-ac-archive.patch b/dev-util/confix/files/2.2.0/ext-ac-archive.patch
new file mode 100644
index 000000000000..32122c95bfe2
--- /dev/null
+++ b/dev-util/confix/files/2.2.0/ext-ac-archive.patch
@@ -0,0 +1,35 @@
+diff -ru confix-9999.orig/libconfix/plugins/automake/bootstrap.py confix-9999/libconfix/plugins/automake/bootstrap.py
+--- confix-9999.orig/libconfix/plugins/automake/bootstrap.py	2009-10-30 13:25:27.962172020 +0100
++++ confix-9999/libconfix/plugins/automake/bootstrap.py	2009-10-30 13:27:14.780605001 +0100
+@@ -16,7 +16,7 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA
+ 
+-import autoconf_archive
++#import autoconf_archive
+ import kde_hack
+ 
+ from libconfix.core.utils.error import Error
+@@ -29,7 +29,7 @@
+ 
+ def bootstrap(packageroot, use_kde_hack, argv0, path=None):
+     aclocal_incdirs = []
+-    aclocal_incdirs.append(autoconf_archive.include_path(argv0))
++    #aclocal_incdirs.append(autoconf_archive.include_path(argv0))
+ 
+     # if package's configure.ac looks like using libtool, then we
+     # assume that the package must be libtoolize'd.
+diff -ru confix-9999.orig/setup.py confix-9999/setup.py
+--- confix-9999.orig/setup.py	2009-10-30 13:25:27.965360137 +0100
++++ confix-9999/setup.py	2009-10-30 13:26:47.822129311 +0100
+@@ -41,8 +41,8 @@
+     return result
+ 
+ datafiles = []
+-datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', []))
+-datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', []))
++#datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', []))
++#datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', []))
+ 
+ # scripts to put in the auxdir.
+ datafiles.extend([('share/confix/kde-hack',