Gentoo Archives: gentoo-commits

From: "Markus Duft (mduft)" <mduft@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/confix/files/2.2.0: ext-ac-archive.patch exeext.patch
Date: Tue, 03 Nov 2009 17:09:02
Message-Id: E1N5MsO-0001Rr-MM@stork.gentoo.org
1 mduft 09/11/03 17:09:00
2
3 Added: ext-ac-archive.patch exeext.patch
4 Log:
5 added live svn ebuild for upcoming confix-2.2
6 (Portage version: 2.1.6.13/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 dev-util/confix/files/2.2.0/ext-ac-archive.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/confix/files/2.2.0/ext-ac-archive.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/confix/files/2.2.0/ext-ac-archive.patch?rev=1.1&content-type=text/plain
13
14 Index: ext-ac-archive.patch
15 ===================================================================
16 diff -ru confix-9999.orig/libconfix/plugins/automake/bootstrap.py confix-9999/libconfix/plugins/automake/bootstrap.py
17 --- confix-9999.orig/libconfix/plugins/automake/bootstrap.py 2009-10-30 13:25:27.962172020 +0100
18 +++ confix-9999/libconfix/plugins/automake/bootstrap.py 2009-10-30 13:27:14.780605001 +0100
19 @@ -16,7 +16,7 @@
20 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
21 # USA
22
23 -import autoconf_archive
24 +#import autoconf_archive
25 import kde_hack
26
27 from libconfix.core.utils.error import Error
28 @@ -29,7 +29,7 @@
29
30 def bootstrap(packageroot, use_kde_hack, argv0, path=None):
31 aclocal_incdirs = []
32 - aclocal_incdirs.append(autoconf_archive.include_path(argv0))
33 + #aclocal_incdirs.append(autoconf_archive.include_path(argv0))
34
35 # if package's configure.ac looks like using libtool, then we
36 # assume that the package must be libtoolize'd.
37 diff -ru confix-9999.orig/setup.py confix-9999/setup.py
38 --- confix-9999.orig/setup.py 2009-10-30 13:25:27.965360137 +0100
39 +++ confix-9999/setup.py 2009-10-30 13:26:47.822129311 +0100
40 @@ -41,8 +41,8 @@
41 return result
42
43 datafiles = []
44 -datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', []))
45 -datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', []))
46 +#datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', []))
47 +#datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', []))
48
49 # scripts to put in the auxdir.
50 datafiles.extend([('share/confix/kde-hack',
51
52
53
54 1.1 dev-util/confix/files/2.2.0/exeext.patch
55
56 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/confix/files/2.2.0/exeext.patch?rev=1.1&view=markup
57 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/confix/files/2.2.0/exeext.patch?rev=1.1&content-type=text/plain
58
59 Index: exeext.patch
60 ===================================================================
61 diff -ru confix-9999.orig/libconfix/plugins/automake/makefile_am.py confix-9999/libconfix/plugins/automake/makefile_am.py
62 --- confix-9999.orig/libconfix/plugins/automake/makefile_am.py 2009-10-30 13:20:42.106291175 +0100
63 +++ confix-9999/libconfix/plugins/automake/makefile_am.py 2009-10-30 13:23:39.562354663 +0100
64 @@ -472,7 +472,15 @@
65
66 # register automatic tests and set their environment
67
68 - tests = self.dir_primary('check', 'PROGRAMS') + \
69 + test_tmp = self.dir_primary('check', 'PROGRAMS')
70 + count = 0
71 + for prog in test_tmp:
72 + prog += "$(EXEEXT)"
73 + test_tmp[count] = prog
74 + count += 1
75 + pass
76 +
77 + tests = test_tmp + \
78 self.dir_primary('check', 'SCRIPTS')
79 if len(tests):
80 lines.extend(makefile.List(name='TESTS', values=tests, mitigate=True).lines())