diff options
author | Michael Haubenwallner <haubi@gentoo.org> | 2008-05-13 14:44:11 +0000 |
---|---|---|
committer | Michael Haubenwallner <haubi@gentoo.org> | 2008-05-13 14:44:11 +0000 |
commit | d1994f1b2e8fe77197dc09bde6ec576344b6a69d (patch) | |
tree | f1bfdbcb2db510d84be16d40e6db81a8f473deea /dev-util/confix/files | |
parent | Marked ~hppa (LuckyLuke). (diff) | |
download | gentoo-2-d1994f1b2e8fe77197dc09bde6ec576344b6a69d.tar.gz gentoo-2-d1994f1b2e8fe77197dc09bde6ec576344b6a69d.tar.bz2 gentoo-2-d1994f1b2e8fe77197dc09bde6ec576344b6a69d.zip |
initial import of dev-util/confix (ebuild from me).
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-util/confix/files')
-rw-r--r-- | dev-util/confix/files/2.1.0/CALL_RESCAN_HACK.patch | 37 | ||||
-rw-r--r-- | dev-util/confix/files/2.1.0/exeext.patch | 20 | ||||
-rw-r--r-- | dev-util/confix/files/2.1.0/ext-ac-archive.patch | 30 | ||||
-rw-r--r-- | dev-util/confix/files/2.1.0/jni-hpux.patch | 10 |
4 files changed, 97 insertions, 0 deletions
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 + |