summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <haubi@gentoo.org>2008-05-13 14:44:11 +0000
committerMichael Haubenwallner <haubi@gentoo.org>2008-05-13 14:44:11 +0000
commitce401a6c3e55ba20a94f0f45ce1f701b92b25fdf (patch)
treed838bf3de4daef8b2842321781a66b256732c1cd /dev-util/confix
parentMarked ~hppa (LuckyLuke). (diff)
downloadhistorical-ce401a6c3e55ba20a94f0f45ce1f701b92b25fdf.tar.gz
historical-ce401a6c3e55ba20a94f0f45ce1f701b92b25fdf.tar.bz2
historical-ce401a6c3e55ba20a94f0f45ce1f701b92b25fdf.zip
initial import of dev-util/confix (ebuild from me).
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'dev-util/confix')
-rw-r--r--dev-util/confix/ChangeLog12
-rw-r--r--dev-util/confix/confix-2.1.0.ebuild50
-rw-r--r--dev-util/confix/files/2.1.0/CALL_RESCAN_HACK.patch37
-rw-r--r--dev-util/confix/files/2.1.0/exeext.patch20
-rw-r--r--dev-util/confix/files/2.1.0/ext-ac-archive.patch30
-rw-r--r--dev-util/confix/files/2.1.0/jni-hpux.patch10
-rw-r--r--dev-util/confix/metadata.xml12
7 files changed, 171 insertions, 0 deletions
diff --git a/dev-util/confix/ChangeLog b/dev-util/confix/ChangeLog
new file mode 100644
index 000000000000..33405c4902e8
--- /dev/null
+++ b/dev-util/confix/ChangeLog
@@ -0,0 +1,12 @@
+# 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.1 2008/05/13 14:44:10 haubi Exp $
+
+*confix-2.1.0 (13 May 2008)
+
+ 13 May 2008; Michael Haubenwallner <haubi@gentoo.org>
+ +files/2.1.0/CALL_RESCAN_HACK.patch, +files/2.1.0/exeext.patch,
+ +files/2.1.0/ext-ac-archive.patch, +files/2.1.0/jni-hpux.patch,
+ +metadata.xml, +confix-2.1.0.ebuild:
+ initial import of dev-util/confix (ebuild from me).
+
diff --git a/dev-util/confix/confix-2.1.0.ebuild b/dev-util/confix/confix-2.1.0.ebuild
new file mode 100644
index 000000000000..a3d8245cccb4
--- /dev/null
+++ b/dev-util/confix/confix-2.1.0.ebuild
@@ -0,0 +1,50 @@
+# 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.ebuild,v 1.1 2008/05/13 14:44:10 haubi Exp $
+
+inherit distutils
+
+DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
+HOMEPAGE="http://confix.sourceforge.net"
+SRC_URI="mirror://sourceforge/confix/Confix-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~x86"
+
+DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}
+ sys-devel/automake
+ sys-devel/libtool
+ sys-devel/autoconf-archive
+ dev-util/confix-wrapper
+"
+
+S="${WORKDIR}/Confix-${PV}"
+PYTHON_MODNAME="libconfix tests"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # find jni-include dirs on hpux.
+ epatch "${FILESDIR}"/${PV}/jni-hpux.patch
+ # hack to ignore duplicate files in rescan
+ epatch "${FILESDIR}"/${PV}/CALL_RESCAN_HACK.patch
+ # add .exe extension to TESTS
+ epatch "${FILESDIR}"/${PV}/exeext.patch
+ # use external autoconf archive
+ epatch "${FILESDIR}"/${PV}/ext-ac-archive.patch
+
+ # need to store repos in exact versioned share/confix-PV/repo
+ sed -i -e "s,'confix2','confix-${PV}'," \
+ libconfix/core/automake/repo_automake.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.1.0/CALL_RESCAN_HACK.patch b/dev-util/confix/files/2.1.0/CALL_RESCAN_HACK.patch
new file mode 100644
index 000000000000..beac44f32862
--- /dev/null
+++ b/dev-util/confix/files/2.1.0/CALL_RESCAN_HACK.patch
@@ -0,0 +1,37 @@
+diff -ruN Confix-2.1.0.orig/libconfix/core/filesys/directory.py Confix-2.1.0/libconfix/core/filesys/directory.py
+--- Confix-2.1.0.orig/libconfix/core/filesys/directory.py 2007-08-10 11:56:15.259323000 +0200
++++ Confix-2.1.0/libconfix/core/filesys/directory.py 2007-08-10 11:59:35.163484000 +0200
+@@ -68,8 +68,8 @@
+ def add(self, name, entry):
+ assert isinstance(entry, DirectoryEntry)
+ assert entry.filesystem() is None or entry.filesystem() is self.filesystem()
+- if self.entry_by_name_.has_key(name):
+- raise Directory.AlreadyMounted(name=name, dir=self)
++ #if self.entry_by_name_.has_key(name):
++ #raise Directory.AlreadyMounted(name=name, dir=self)
+ self.entry_by_name_[name] = entry
+ self.name_by_entry_[entry] = name
+ entry.set_parent(self)
+diff -ruN Confix-2.1.0.orig/libconfix/core/filesys/scan.py Confix-2.1.0/libconfix/core/filesys/scan.py
+--- Confix-2.1.0.orig/libconfix/core/filesys/scan.py 2007-08-10 11:56:15.199323000 +0200
++++ Confix-2.1.0/libconfix/core/filesys/scan.py 2007-08-10 11:59:35.173484000 +0200
+@@ -52,19 +52,6 @@
+ if name in ['.', '..']:
+ continue
+ absname = os.path.join(abspath, name)
+- existing_entry = dir.get(name)
+- # <paranoia>
+- if existing_entry is not None:
+- if os.path.isfile(absname):
+- if not isinstance(existing_entry, File):
+- raise Error('Cannot convert existing entry '+name+' to a file')
+- continue
+- if os.path.isdir(absname):
+- if not isinstance(existing_entry, Directory):
+- raise Error('Cannot convert existing entry '+name+' to a directory')
+- continue
+- raise Error(absname+' has unknown type')
+- # </paranoia>
+
+ # go add the new entry
+ if os.path.isfile(absname):
diff --git a/dev-util/confix/files/2.1.0/exeext.patch b/dev-util/confix/files/2.1.0/exeext.patch
new file mode 100644
index 000000000000..9378883f8b38
--- /dev/null
+++ b/dev-util/confix/files/2.1.0/exeext.patch
@@ -0,0 +1,20 @@
+diff -rubB Confix-2.1.0.orig/libconfix/core/automake/makefile_am.py Confix-2.1.0/libconfix/core/automake/makefile_am.py
+--- Confix-2.1.0.orig/libconfix/core/automake/makefile_am.py Tue Oct 9 13:50:28 2007
++++ Confix-2.1.0/libconfix/core/automake/makefile_am.py Tue Oct 9 14:09:47 2007
+@@ -469,7 +469,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(List(name='TESTS', values=tests, mitigate=True).lines())
diff --git a/dev-util/confix/files/2.1.0/ext-ac-archive.patch b/dev-util/confix/files/2.1.0/ext-ac-archive.patch
new file mode 100644
index 000000000000..e01fc08c2fb1
--- /dev/null
+++ b/dev-util/confix/files/2.1.0/ext-ac-archive.patch
@@ -0,0 +1,30 @@
+--- libconfix/core/automake/bootstrap.py.orig 2008-04-08 09:37:29.000000000 +0200
++++ libconfix/core/automake/bootstrap.py 2008-04-08 09:37:44.000000000 +0200
+@@ -23,12 +23,12 @@
+ from libconfix.core.utils import helper
+ from libconfix.core.utils import debug
+
+-import autoconf_archive
++#import autoconf_archive
+ import kde_hack
+
+ def bootstrap(packageroot, use_libtool, 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 use_libtool:
+ libtoolize_prog = external_cmd.search_program('libtoolize', path)
+--- setup.py.orig 2008-04-08 09:40:11.000000000 +0200
++++ setup.py 2008-04-08 09:39:09.000000000 +0200
+@@ -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',
diff --git a/dev-util/confix/files/2.1.0/jni-hpux.patch b/dev-util/confix/files/2.1.0/jni-hpux.patch
new file mode 100644
index 000000000000..bd1b626e7bc2
--- /dev/null
+++ b/dev-util/confix/files/2.1.0/jni-hpux.patch
@@ -0,0 +1,10 @@
+--- Confix-2.0.0pre20/share/confix/autoconf-archive/m4src/ac_jni_include_dir.m4.orig 2007-02-07 21:16:20.000000000 +0100
++++ Confix-2.0.0pre20/share/confix/autoconf-archive/m4src/ac_jni_include_dir.m4 2007-02-07 21:16:34.000000000 +0100
+@@ -67,6 +67,7 @@
+ mingw*) _JNI_INC_SUBDIRS="win32";;
+ cygwin*) _JNI_INC_SUBDIRS="win32";;
+ interix*) _JNI_INC_SUBDIRS="win32";;
++hpux*) _JNI_INC_SUBDIRS="hp-ux";;
+ *) _JNI_INC_SUBDIRS="genunix";;
+ esac
+
diff --git a/dev-util/confix/metadata.xml b/dev-util/confix/metadata.xml
new file mode 100644
index 000000000000..c137100eac39
--- /dev/null
+++ b/dev-util/confix/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd></herd>
+ <maintainer>
+ <email>haubi@gentoo.org</email>
+ <name>Michael Haubenwallner</name>
+ </maintainer>
+ <longdescription lang="en">
+ </longdescription>
+</pkgmetadata>
+