Gentoo Archives: gentoo-commits

From: "Ian Delaney (idella4)" <idella4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/confix: confix-2.3.5-r2.ebuild confix-9999.ebuild ChangeLog confix-2.3.5-r1.ebuild
Date: Sat, 28 Feb 2015 13:36:48
Message-Id: 20150228133642.1779312BC1@oystercatcher.gentoo.org
1 idella4 15/02/28 13:36:42
2
3 Modified: confix-9999.ebuild ChangeLog
4 Added: confix-2.3.5-r2.ebuild
5 Removed: confix-2.3.5-r1.ebuild
6 Log:
7 revbump conversion -> distutils-r1, ditto live ebuild, rm old, endorsed by maintainer in bug #540894, closes the bug
8
9 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
10
11 Revision Changes Path
12 1.8 dev-util/confix/confix-9999.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/confix/confix-9999.ebuild?rev=1.8&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/confix/confix-9999.ebuild?rev=1.8&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/confix/confix-9999.ebuild?r1=1.7&r2=1.8
17
18 Index: confix-9999.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-util/confix/confix-9999.ebuild,v
21 retrieving revision 1.7
22 retrieving revision 1.8
23 diff -u -r1.7 -r1.8
24 --- confix-9999.ebuild 5 Nov 2013 14:29:15 -0000 1.7
25 +++ confix-9999.ebuild 28 Feb 2015 13:36:42 -0000 1.8
26 @@ -1,13 +1,13 @@
27 -# Copyright 1999-2013 Gentoo Foundation
28 +# Copyright 1999-2015 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/confix-9999.ebuild,v 1.7 2013/11/05 14:29:15 haubi Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/confix-9999.ebuild,v 1.8 2015/02/28 13:36:42 idella4 Exp $
32
33 -EAPI=3
34 -PYTHON_DEPEND="2"
35 -SUPPORT_PYTHON_ABIS="1"
36 -RESTRICT_PYTHON_ABIS="3.*"
37 +EAPI=5
38
39 -inherit distutils eutils subversion
40 +PYTHON_COMPAT=( python2_7 )
41 +DISTUTILS_SINGLE_IMPL=1
42 +
43 +inherit distutils-r1 subversion
44
45 DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
46 HOMEPAGE="http://confix.sourceforge.net"
47 @@ -25,19 +25,19 @@
48 sys-devel/automake
49 sys-devel/libtool"
50
51 -PYTHON_MODNAME="libconfix"
52 -
53 -src_prepare() {
54 - # find jni-include dirs on hpux.
55 - epatch "${FILESDIR}"/2.1.0/jni-hpux.patch
56 +PATCHES=( # find jni-include dirs on hpux.
57 + "${FILESDIR}"/2.1.0/jni-hpux.patch
58 # add .exe extension to TESTS
59 - epatch "${FILESDIR}"/2.3.0/exeext.patch
60 + "${FILESDIR}"/2.3.0/exeext.patch
61 # use external autoconf archive
62 - epatch "${FILESDIR}"/2.3.0/ext-ac-archive.patch
63 + "${FILESDIR}"/2.3.0/ext-ac-archive.patch
64 # link local libraries first.
65 - epatch "${FILESDIR}"/2.3.0/local-libs-first.patch
66 + "${FILESDIR}"/2.3.0/local-libs-first.patch
67 # don't use automake 1.9, but any newer too...
68 - epatch "${FILESDIR}"/2.3.0/new-automake.patch
69 + "${FILESDIR}"/2.3.0/new-automake.patch )
70 +
71 +pkg_setup() {
72 + python-single-r1_pkg_setup
73 }
74
75 pkg_preinst() {
76
77
78
79 1.21 dev-util/confix/ChangeLog
80
81 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/confix/ChangeLog?rev=1.21&view=markup
82 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/confix/ChangeLog?rev=1.21&content-type=text/plain
83 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/confix/ChangeLog?r1=1.20&r2=1.21
84
85 Index: ChangeLog
86 ===================================================================
87 RCS file: /var/cvsroot/gentoo-x86/dev-util/confix/ChangeLog,v
88 retrieving revision 1.20
89 retrieving revision 1.21
90 diff -u -r1.20 -r1.21
91 --- ChangeLog 5 Nov 2013 14:29:15 -0000 1.20
92 +++ ChangeLog 28 Feb 2015 13:36:42 -0000 1.21
93 @@ -1,6 +1,13 @@
94 # ChangeLog for dev-util/confix
95 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
96 -# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/ChangeLog,v 1.20 2013/11/05 14:29:15 haubi Exp $
97 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
98 +# $Header: /var/cvsroot/gentoo-x86/dev-util/confix/ChangeLog,v 1.21 2015/02/28 13:36:42 idella4 Exp $
99 +
100 +*confix-2.3.5-r2 (28 Feb 2015)
101 +
102 + 28 Feb 2015; Ian Delaney <idella4@g.o> +confix-2.3.5-r2.ebuild,
103 + -confix-2.3.5-r1.ebuild, confix-9999.ebuild:
104 + revbump conversion -> distutils-r1, ditto live ebuild, rm old, endorsed by
105 + maintainer in bug #540894, closes the bug
106
107 05 Nov 2013; Michael Haubenwallner <haubi@g.o> confix-9999.ebuild:
108 Follow upstream repository move.
109 @@ -106,4 +113,3 @@
110 +files/2.1.0/ext-ac-archive.patch, +files/2.1.0/jni-hpux.patch,
111 +metadata.xml, +confix-2.1.0.ebuild:
112 initial import of dev-util/confix (ebuild from me).
113 -
114
115
116
117 1.1 dev-util/confix/confix-2.3.5-r2.ebuild
118
119 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/confix/confix-2.3.5-r2.ebuild?rev=1.1&view=markup
120 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/confix/confix-2.3.5-r2.ebuild?rev=1.1&content-type=text/plain
121
122 Index: confix-2.3.5-r2.ebuild
123 ===================================================================
124 # Copyright 1999-2015 Gentoo Foundation
125 # Distributed under the terms of the GNU General Public License v2
126 # $Header: /var/cvsroot/gentoo-x86/dev-util/confix/confix-2.3.5-r2.ebuild,v 1.1 2015/02/28 13:36:42 idella4 Exp $
127
128 EAPI=5
129
130 PYTHON_COMPAT=( python2_7 )
131 DISTUTILS_SINGLE_IMPL=1
132
133 inherit distutils-r1
134
135 DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
136 HOMEPAGE="http://confix.sourceforge.net"
137 SRC_URI="mirror://sourceforge/confix/Confix-${PV}.tar.bz2"
138
139 LICENSE="GPL-2"
140 SLOT="2"
141 KEYWORDS="~amd64 ~x86 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~x86-linux ~sparc-solaris ~x86-solaris"
142 IUSE=""
143
144 DEPEND=""
145 RDEPEND="dev-util/confix-wrapper
146 sys-devel/autoconf-archive
147 sys-devel/automake
148 sys-devel/libtool"
149
150 S="${WORKDIR}/Confix-${PV}"
151
152 PATCHES=( # find jni-include dirs on hpux.
153 "${FILESDIR}"/2.1.0/jni-hpux.patch
154 # add .exe extension to TESTS
155 "${FILESDIR}"/2.3.0/exeext.patch
156 # use external autoconf archive
157 "${FILESDIR}"/2.3.0/ext-ac-archive.patch
158 # link local libraries first.
159 "${FILESDIR}"/2.3.0/local-libs-first.patch
160 # don't use automake 1.9, but any newer too...
161 "${FILESDIR}"/2.3.0/new-automake.patch )
162
163 pkg_setup() {
164 python-single-r1_pkg_setup
165 }
166
167 pkg_preinst() {
168 local RV=2.3.0
169
170 if has_version "<dev-util/confix-${RV}"; then
171 einfo "After merging ${P} you might have to remerge all packages built"
172 einfo "with <dev-util/confix-${RV} in your EPREFIX to get all the"
173 einfo "repo files useable with current ${PN}".
174 ewarn
175 ewarn "Use this command (copy&paste) to identify packages built with confix"
176 ewarn "needing a remerge in your particular instance of Gentoo Prefix:"
177 ewarn
178 # use 'echo' to get this command from here:
179 ewarn "( cd \$(portageq envvar EPREFIX)/var/db/pkg || exit 1;" \
180 "pattern=\$(cd ../../.. && echo \$(ls -d" \
181 "usr/share/confix*/repo | grep -v confix-${RV}) |" \
182 "sed -e 's, ,|,g'); if [[ -z \${pattern} ]]; then echo" \
183 "'No more packages were built with broken Confix.'; exit 0;" \
184 "fi; emerge --ask --oneshot \$(grep -lE \"(\${pattern})\"" \
185 "*/*/CONTENTS | sed -e 's,^,>=,;s,/CONTENTS,,')" \
186 ")"
187 ewarn
188 fi
189 }