1 |
commit: 4ac04f05a9419958e65ab6d6e7756d2f809a2ac2 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 5 04:43:40 2016 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 5 04:43:40 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac04f05 |
7 |
|
8 |
sci-calculators/units: Drop unsupported patch. |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
.../units/files/units-2.13-fix-python.patch | 144 --------------------- |
13 |
sci-calculators/units/units-2.13-r1.ebuild | 52 -------- |
14 |
2 files changed, 196 deletions(-) |
15 |
|
16 |
diff --git a/sci-calculators/units/files/units-2.13-fix-python.patch b/sci-calculators/units/files/units-2.13-fix-python.patch |
17 |
deleted file mode 100644 |
18 |
index 5278890..00000000 |
19 |
--- a/sci-calculators/units/files/units-2.13-fix-python.patch |
20 |
+++ /dev/null |
21 |
@@ -1,144 +0,0 @@ |
22 |
-* Unify the two python codebases, making the installation less cumbersome |
23 |
-* Remove the broken python handling in Autoconf and the Makefile |
24 |
- |
25 |
---- a/units_cur3 |
26 |
-+++ b/units_cur3 |
27 |
-@@ -16,6 +16,12 @@ |
28 |
- # Added test for non-unicode strings to prevent a runtime warning |
29 |
- # |
30 |
- |
31 |
-+# py2.7 shims |
32 |
-+from __future__ import unicode_literals |
33 |
-+from builtins import map, str, range |
34 |
-+from future.standard_library import install_aliases |
35 |
-+install_aliases() |
36 |
-+ |
37 |
- import sys |
38 |
- import urllib.request, urllib.parse, urllib.error |
39 |
- import os |
40 |
---- a/configure.ac |
41 |
-+++ b/configure.ac |
42 |
-@@ -155,18 +155,6 @@ |
43 |
- fi |
44 |
- fi |
45 |
- |
46 |
-- |
47 |
--AC_PATH_PROG(PYTHON, python, no) |
48 |
-- |
49 |
--if test $PYTHON = no; then |
50 |
-- HAVE_PYTHON=no |
51 |
-- echo ' Units will work without python but the currency update' |
52 |
-- echo ' script, units_cur, will not be installed' |
53 |
-- PYTHON='' |
54 |
--else |
55 |
-- HAVE_PYTHON=yes |
56 |
--fi |
57 |
-- |
58 |
- dnl Check for path search option |
59 |
- AC_ARG_ENABLE([relocation], |
60 |
- AC_HELP_STRING([--enable-relocation], |
61 |
---- a/Makefile.in |
62 |
-+++ b/Makefile.in |
63 |
-@@ -79,14 +79,14 @@ |
64 |
- DISTFILES = README ChangeLog units.info units.txt getopt1.c units.dvi \ |
65 |
- Makefile.in units.c getopt.c getopt.h definitions.units units.texinfo \ |
66 |
- configure.ac configure strfunc.c COPYING install-sh \ |
67 |
-- units.man NEWS texi2man INSTALL units.pdf units_cur2 units_cur3 \ |
68 |
-+ units.man NEWS texi2man INSTALL units.pdf \ |
69 |
- parse.tab.c parse.y units.h locale_map.txt fdl-1.3.texi currency.units \ |
70 |
- unitsfile.ico unitsprog.ico units.rc icon_ms.png \ |
71 |
- Makefile.OS2 makeobjs.cmd README.OS2 \ |
72 |
- UnitsMKS.texinfo UnitsMKS.pdf setvcvars.sh \ |
73 |
- UnitsWin.texinfo UnitsWin.pdf winmkdirs.bat Makefile.Win |
74 |
- |
75 |
--all: units@EXEEXT@ units.1 units.info units_cur_inst |
76 |
-+all: units@EXEEXT@ units.1 units.info |
77 |
- |
78 |
- units.@OBJEXT@: units.c units.h |
79 |
- |
80 |
-@@ -98,47 +98,11 @@ |
81 |
- units@EXEEXT@: $(OBJECTS) @MKS_RES@ |
82 |
- $(CC) $(CFLAGS) $(LDFLAGS) -o units@EXEEXT@ $(OBJECTS) @MKS_RES@ $(LIBS) |
83 |
- |
84 |
--units_cur: units_cur2 units_cur3 |
85 |
-- @if test $(HAVE_PYTHON) = no; then \ |
86 |
-- $(MAKE) units_cur_dummy; \ |
87 |
-- else \ |
88 |
-- version=`$(PYTHON) --version 2>&1`; \ |
89 |
-- if echo $$version | grep 'Python 2' >/dev/null; then \ |
90 |
-- cp $(srcdir)/units_cur2 units_cur; \ |
91 |
-- echo Creating units_cur for Python 2; \ |
92 |
-- elif echo $$version | grep 'Python 3'>/dev/null; then \ |
93 |
-- cp $(srcdir)/units_cur3 units_cur; \ |
94 |
-- echo Creating units_cur for Python 3; \ |
95 |
-- else \ |
96 |
-- echo Unrecognized Python version: $$version; \ |
97 |
-- echo Unable to create correct units_cur; \ |
98 |
-- exit 1; \ |
99 |
-- fi; \ |
100 |
-- fi |
101 |
-- |
102 |
--units_cur_dummy: |
103 |
-- echo '\#!/bin/sh' > units_cur |
104 |
-- echo 'echo Units_cur requires python, which was not found when units was configured' >> units_cur |
105 |
-- chmod +x units_cur |
106 |
-- |
107 |
--units_cur3: units_cur2 |
108 |
-- -mkdir python3_tempdir |
109 |
-- 2to3 --no-diffs -n -o python3_tempdir -w units_cur2 |
110 |
-- mv python3_tempdir/units_cur2 units_cur3 |
111 |
-- rm -rf python3_tempdir |
112 |
-- |
113 |
--units_cur_inst: units_cur |
114 |
-- sed -e "s@outfile = 'currency.units'@outfile='@UDAT@××××××××.units'@"\ |
115 |
-- -e "s@/usr/bin/python@$(PYTHON)@" \ |
116 |
-- units_cur > units_cur_inst |
117 |
-- |
118 |
--install-support: definitions.units currency.units units_cur_inst |
119 |
-+install-support: definitions.units currency.units |
120 |
- $(MKDIR_P) $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) |
121 |
- $(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@×××××××××××.units |
122 |
- $(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)@UDAT@××××××××.units |
123 |
- $(INSTALL_DATA) $(srcdir)/locale_map.txt $(DESTDIR)@UDAT@locale_map.txt |
124 |
-- if test $(HAVE_PYTHON) = yes; then \ |
125 |
-- $(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`;fi |
126 |
- if test $(HAVE_MKS) = yes; then make install-mks; fi |
127 |
- |
128 |
- |
129 |
-@@ -209,14 +173,13 @@ |
130 |
- $(DESTDIR)@UDAT@locale_map.txt \ |
131 |
- $(DESTDIR)@UDAT@×××××××××.ico \ |
132 |
- $(DESTDIR)@UDAT@×××××××××.ico \ |
133 |
-- $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'` |
134 |
- -rmdir $(DESTDIR)@UDAT@ |
135 |
- @if test -f $(DESTDIR)$(infodir)/dir; then \ |
136 |
- echo You may need to remove units.info from $(DESTDIR)$(infodir)/dir; \ |
137 |
- else true; fi |
138 |
- |
139 |
- clean mostlyclean: texclean |
140 |
-- -rm -f *.obj *.res units.exe units.dvi units.1 distname .chk units_cur_inst units_cur |
141 |
-+ -rm -f *.obj *.res units.exe units.dvi units.1 distname .chk |
142 |
- -rm -rf wwwold wwwnew |
143 |
- |
144 |
- distclean: clean |
145 |
-@@ -232,9 +195,8 @@ |
146 |
- -rm -f units.log UnitsMKS.log UnitsWin.log \ |
147 |
- *.aux *.cp *.fn *.ky *.op *.pg *.toc *.tp *.vr |
148 |
- |
149 |
--currency.units: units_cur |
150 |
-+currency.units: |
151 |
- @echo "Trying to update currency.units (will use existing file if this fails)" |
152 |
-- -./units_cur |
153 |
- |
154 |
- sig: |
155 |
- echo units-`sed -n -e '/\#.*VERSION/s/.*"\(.*\)"/\1/gp' \ |
156 |
-@@ -247,8 +209,7 @@ |
157 |
- -rm -f `cat distname`.directive distname |
158 |
- |
159 |
- |
160 |
--dist: $(DISTFILES) units_cur |
161 |
-- @./units_cur |
162 |
-+dist: $(DISTFILES) |
163 |
- @echo Updated currencies, running check: |
164 |
- ./units -f definitions.units -c |
165 |
- @echo '' |
166 |
|
167 |
diff --git a/sci-calculators/units/units-2.13-r1.ebuild b/sci-calculators/units/units-2.13-r1.ebuild |
168 |
deleted file mode 100644 |
169 |
index 588585b..00000000 |
170 |
--- a/sci-calculators/units/units-2.13-r1.ebuild |
171 |
+++ /dev/null |
172 |
@@ -1,52 +0,0 @@ |
173 |
-# Copyright 1999-2016 Gentoo Foundation |
174 |
-# Distributed under the terms of the GNU General Public License v2 |
175 |
-# $Id$ |
176 |
- |
177 |
-EAPI=6 |
178 |
- |
179 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
180 |
-PYTHON_REQ_USE="xml" |
181 |
- |
182 |
-inherit autotools python-r1 |
183 |
- |
184 |
-DESCRIPTION="Unit conversion program" |
185 |
-HOMEPAGE="https://www.gnu.org/software/units/units.html" |
186 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
187 |
- |
188 |
-LICENSE="FDL-1.3 GPL-3" |
189 |
-SLOT="0" |
190 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
191 |
-IUSE="+units_cur" |
192 |
-REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )" |
193 |
- |
194 |
-RDEPEND=" |
195 |
- sys-libs/readline:0= |
196 |
- units_cur? ( |
197 |
- ${PYTHON_DEPS} |
198 |
- dev-python/unidecode[${PYTHON_USEDEP}] |
199 |
- dev-python/future[${PYTHON_USEDEP}] |
200 |
- ) |
201 |
-" |
202 |
-DEPEND=" |
203 |
- ${RDEPEND} |
204 |
-" |
205 |
- |
206 |
-PATCHES=( |
207 |
- "${FILESDIR}"/${P}-fix-python.patch |
208 |
-) |
209 |
- |
210 |
-src_prepare() { |
211 |
- default |
212 |
- |
213 |
- sed \ |
214 |
- -e "/^outfile/s|'.*'|'${EPREFIX}/usr/share/units/currency.units'|g" \ |
215 |
- -i units_cur3 || die |
216 |
- |
217 |
- eautoreconf |
218 |
-} |
219 |
- |
220 |
-src_install() { |
221 |
- default |
222 |
- |
223 |
- use units_cur && python_foreach_impl python_newscript units_cur{3,} |
224 |
-} |