public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/, sci-calculators/units/files/
@ 2016-09-05  4:44 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2016-09-05  4:44 UTC (permalink / raw
  To: gentoo-commits

commit:     4ac04f05a9419958e65ab6d6e7756d2f809a2ac2
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 04:43:40 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 04:43:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac04f05

sci-calculators/units: Drop unsupported patch.

Package-Manager: portage-2.3.0

 .../units/files/units-2.13-fix-python.patch        | 144 ---------------------
 sci-calculators/units/units-2.13-r1.ebuild         |  52 --------
 2 files changed, 196 deletions(-)

diff --git a/sci-calculators/units/files/units-2.13-fix-python.patch b/sci-calculators/units/files/units-2.13-fix-python.patch
deleted file mode 100644
index 5278890..00000000
--- a/sci-calculators/units/files/units-2.13-fix-python.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-* Unify the two python codebases, making the installation less cumbersome
-* Remove the broken python handling in Autoconf and the Makefile
-
---- a/units_cur3
-+++ b/units_cur3
-@@ -16,6 +16,12 @@
- # Added test for non-unicode strings to prevent a runtime warning
- #
- 
-+# py2.7 shims
-+from __future__ import unicode_literals
-+from builtins import map, str, range
-+from future.standard_library import install_aliases
-+install_aliases()
-+
- import sys
- import urllib.request, urllib.parse, urllib.error
- import os
---- a/configure.ac
-+++ b/configure.ac
-@@ -155,18 +155,6 @@
-     fi
- fi
- 
--
--AC_PATH_PROG(PYTHON, python, no)
--
--if test $PYTHON = no; then 
--   HAVE_PYTHON=no
--   echo '    Units will work without python but the currency update'
--   echo '    script, units_cur,  will not be installed'
--   PYTHON=''
--else
--   HAVE_PYTHON=yes
--fi
--
- dnl Check for path search option
- AC_ARG_ENABLE([relocation],
-     AC_HELP_STRING([--enable-relocation],
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -79,14 +79,14 @@
- DISTFILES = README ChangeLog units.info units.txt getopt1.c units.dvi \
-    Makefile.in units.c getopt.c getopt.h definitions.units units.texinfo \
-    configure.ac configure strfunc.c COPYING install-sh \
--   units.man NEWS texi2man INSTALL units.pdf units_cur2 units_cur3 \
-+   units.man NEWS texi2man INSTALL units.pdf \
-    parse.tab.c parse.y units.h locale_map.txt fdl-1.3.texi currency.units \
-    unitsfile.ico unitsprog.ico units.rc icon_ms.png \
-    Makefile.OS2 makeobjs.cmd README.OS2 \
-    UnitsMKS.texinfo UnitsMKS.pdf setvcvars.sh \
-    UnitsWin.texinfo UnitsWin.pdf winmkdirs.bat Makefile.Win
- 
--all: units@EXEEXT@ units.1 units.info units_cur_inst
-+all: units@EXEEXT@ units.1 units.info
- 
- units.@OBJEXT@: units.c units.h
- 
-@@ -98,47 +98,11 @@
- units@EXEEXT@: $(OBJECTS) @MKS_RES@
- 	$(CC) $(CFLAGS) $(LDFLAGS)  -o units@EXEEXT@ $(OBJECTS) @MKS_RES@ $(LIBS)
- 
--units_cur: units_cur2 units_cur3
--	@if test $(HAVE_PYTHON) = no; then \
--	  $(MAKE) units_cur_dummy; \
--	else \
--	  version=`$(PYTHON) --version 2>&1`; \
--	  if echo $$version | grep 'Python 2' >/dev/null; then \
--	    cp $(srcdir)/units_cur2 units_cur; \
--	    echo Creating units_cur for Python 2; \
--	  elif echo $$version | grep 'Python 3'>/dev/null; then \
--	    cp $(srcdir)/units_cur3 units_cur; \
--	    echo Creating units_cur for Python 3; \
--	  else \
--	    echo Unrecognized Python version: $$version; \
--	    echo Unable to create correct units_cur; \
--	    exit 1; \
--	  fi; \
--	fi
--
--units_cur_dummy:
--	echo '\#!/bin/sh' > units_cur
--	echo 'echo Units_cur requires python, which was not found when units was configured' >> units_cur
--	chmod +x units_cur
--
--units_cur3: units_cur2
--	-mkdir python3_tempdir
--	2to3 --no-diffs -n -o python3_tempdir -w units_cur2
--	mv python3_tempdir/units_cur2 units_cur3
--	rm -rf python3_tempdir
--
--units_cur_inst: units_cur
--	sed -e "s@outfile = 'currency.units'@outfile='@UDAT@currency.units'@"\
--            -e "s@/usr/bin/python@$(PYTHON)@" \
--             units_cur > units_cur_inst
--
--install-support: definitions.units currency.units units_cur_inst
-+install-support: definitions.units currency.units
- 	$(MKDIR_P) $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) 
- 	$(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@definitions.units
- 	$(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)@UDAT@currency.units
- 	$(INSTALL_DATA) $(srcdir)/locale_map.txt $(DESTDIR)@UDAT@locale_map.txt
--	if test $(HAVE_PYTHON) = yes; then \
--	  $(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`;fi
- 	if test $(HAVE_MKS) = yes; then make install-mks; fi
- 
- 
-@@ -209,14 +173,13 @@
- 	       $(DESTDIR)@UDAT@locale_map.txt \
- 	       $(DESTDIR)@UDAT@unitsfile.ico \
- 	       $(DESTDIR)@UDAT@unitsprog.ico \
--	       $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
- 	-rmdir $(DESTDIR)@UDAT@
- 	@if test -f $(DESTDIR)$(infodir)/dir; then \
- 	  echo You may need to remove units.info from $(DESTDIR)$(infodir)/dir; \
- 	else true; fi
- 
- clean mostlyclean: texclean
--	-rm -f *.obj *.res units.exe units.dvi units.1 distname .chk units_cur_inst units_cur
-+	-rm -f *.obj *.res units.exe units.dvi units.1 distname .chk
- 	-rm -rf wwwold wwwnew
- 
- distclean: clean
-@@ -232,9 +195,8 @@
- 	-rm -f units.log UnitsMKS.log UnitsWin.log \
- 	    *.aux *.cp *.fn *.ky *.op *.pg *.toc *.tp *.vr
- 
--currency.units: units_cur
-+currency.units:
- 	@echo "Trying to update currency.units (will use existing file if this fails)"
--	-./units_cur
- 
- sig:
- 	echo units-`sed -n -e '/\#.*VERSION/s/.*"\(.*\)"/\1/gp' \
-@@ -247,8 +209,7 @@
- 	-rm -f `cat distname`.directive distname
- 
- 
--dist: $(DISTFILES) units_cur
--	@./units_cur
-+dist: $(DISTFILES)
- 	@echo Updated currencies, running check:
- 	./units -f definitions.units -c
- 	@echo ''

diff --git a/sci-calculators/units/units-2.13-r1.ebuild b/sci-calculators/units/units-2.13-r1.ebuild
deleted file mode 100644
index 588585b..00000000
--- a/sci-calculators/units/units-2.13-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools python-r1
-
-DESCRIPTION="Unit conversion program"
-HOMEPAGE="https://www.gnu.org/software/units/units.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.3 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+units_cur"
-REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sys-libs/readline:0=
-	units_cur? (
-		${PYTHON_DEPS}
-		dev-python/unidecode[${PYTHON_USEDEP}]
-		dev-python/future[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-python.patch
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^outfile/s|'.*'|'${EPREFIX}/usr/share/units/currency.units'|g" \
-		-i units_cur3 || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	use units_cur && python_foreach_impl python_newscript units_cur{3,}
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/, sci-calculators/units/files/
@ 2018-06-26 19:21 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2018-06-26 19:21 UTC (permalink / raw
  To: gentoo-commits

commit:     fd82bd40312ded4b7de57786920fe72d3a0ae7fa
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 19:20:30 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 19:21:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd82bd40

sci-calculators/units: Version 2.17.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-calculators/units/Manifest                     |  1 +
 .../units/files/units-2.17-network-sandbox.patch   | 11 ++++
 sci-calculators/units/units-2.17.ebuild            | 63 ++++++++++++++++++++++
 3 files changed, 75 insertions(+)

diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 54718b48ff6..1839e593f0d 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1 +1,2 @@
 DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091
+DIST units-2.17.tar.gz 1185070 BLAKE2B 44db938b214596058cdfaeda7fd8d70161221c196a0971b5a0e03331e30fdeb52db85ab43b721f25efd755f4baee4f92aa6204a85d38703a31ec7cac0cefd689 SHA512 e4114f7dc0e40146f969375511c5d930497cb9502306ef82feac78c8e09a03e84ed0b582ff82e2878beae41702c9612f7a3d28fc6e9ed2cfae708f9feb8b737b

diff --git a/sci-calculators/units/files/units-2.17-network-sandbox.patch b/sci-calculators/units/files/units-2.17-network-sandbox.patch
new file mode 100644
index 00000000000..e457610e430
--- /dev/null
+++ b/sci-calculators/units/files/units-2.17-network-sandbox.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -107,7 +107,7 @@
+             -e "s@/usr/bin/python@$(PYTHON)@" \
+              $(srcdir)/units_cur > units_cur_inst
+ 
+-install-support: definitions.units units_cur_inst currency-units-update
++install-support: definitions.units units_cur_inst
+ 	$(MKDIR_P) $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) $(DESTDIR)@CDAT@
+ 	$(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@definitions.units
+ 	-rm -f $(DESTDIR)@UDAT@currency.units

diff --git a/sci-calculators/units/units-2.17.ebuild b/sci-calculators/units/units-2.17.ebuild
new file mode 100644
index 00000000000..01fbb74ef39
--- /dev/null
+++ b/sci-calculators/units/units-2.17.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit eutils python-single-r1
+
+DESCRIPTION="Unit conversion program"
+HOMEPAGE="https://www.gnu.org/software/units/units.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+units_cur"
+REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	sys-libs/readline:=
+	units_cur? (
+		${PYTHON_DEPS}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.17-network-sandbox.patch
+)
+
+pkg_setup() {
+	use units_cur && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--sharedstatedir="${EROOT}/var/lib" \
+		ac_cv_path_PYTHON=no
+}
+
+src_compile() {
+	emake ${PN}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc ChangeLog NEWS README
+
+	# we're intentionally delaying this since 'make install' would
+	# get confused if we shove 'units_cur' there, and there is no real
+	# need to add more complexity for it
+	if use units_cur; then
+		sed \
+			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
+			-e 's|^#!|&/usr/bin/python|g' \
+			units_cur_inst > units_cur || die
+		python_fix_shebang units_cur
+		python_doscript units_cur
+	fi
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/, sci-calculators/units/files/
@ 2020-10-01  8:05 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2020-10-01  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     164ff1b9911d4fbc62980e2d6bdf65399d1619fa
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  1 07:22:24 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Oct  1 08:05:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=164ff1b9

sci-calculators/units: Version 2.20

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 sci-calculators/units/Manifest                     |  1 +
 sci-calculators/units/files/units-2.20-WIN32.patch | 24 ++++++++
 .../units/files/units-2.20-readerror.patch         | 11 ++++
 sci-calculators/units/units-2.20.ebuild            | 68 ++++++++++++++++++++++
 4 files changed, 104 insertions(+)

diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 0265ac77011..ba47bcea8d7 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,3 +1,4 @@
 DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091
 DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7
 DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8
+DIST units-2.20.tar.gz 1309242 BLAKE2B 5321e6234cfe4514d1ebccec490e472ff64a0428bb2721f51e3ff626ddef7eec4b4e8822aa947da1f4ddca414078b617ba34308c86a71788f6d8a9ba20dd6846 SHA512 5292588fb7ea0ab12e45e5521a115a0eaba4e37378011677cbd80e6e17a6ffa5f388a57859c590b6d65460fc91a4ff33e6603e27d4909b8122d4ad3696c8600d

diff --git a/sci-calculators/units/files/units-2.20-WIN32.patch b/sci-calculators/units/files/units-2.20-WIN32.patch
new file mode 100644
index 00000000000..fbe7599831c
--- /dev/null
+++ b/sci-calculators/units/files/units-2.20-WIN32.patch
@@ -0,0 +1,24 @@
+--- a/units.c
++++ b/units.c
+@@ -4087,7 +4087,9 @@
+ checkcwd (char *file)
+ {
+   FILE *fp;
++#ifdef _WIN32
+   char *p;
++#endif
+ 
+   fp = fopen(file, "r");
+   if (fp){
+@@ -4630,7 +4630,10 @@
+ printversion()
+ {
+   int exists;
+-  char *unitsfile, *localemap;
++  char *unitsfile;
++#ifdef _WIN32
++  char *localemap;
++#endif
+ 
+   if (flags.verbose == 0) {
+     printf("GNU Units version %s\n", VERSION);

diff --git a/sci-calculators/units/files/units-2.20-readerror.patch b/sci-calculators/units/files/units-2.20-readerror.patch
new file mode 100644
index 00000000000..ccb12c68153
--- /dev/null
+++ b/sci-calculators/units/files/units-2.20-readerror.patch
@@ -0,0 +1,11 @@
+--- a/units.c
++++ b/units.c
+@@ -761,7 +761,7 @@
+ }
+ 
+ 
+-#define readerror (goterr=1) && errfile && fprintf
++#define readerror(...) do { goterr=1; if (errfile) fprintf(__VA_ARGS__); } while (0)
+ 
+ #define VAGUE_ERR "%s: error in units file '%s' line %d\n", \
+                        progname, file, linenum

diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild
new file mode 100644
index 00000000000..2e744c5f60c
--- /dev/null
+++ b/sci-calculators/units/units-2.20.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-single-r1
+
+DESCRIPTION="Unit conversion program"
+HOMEPAGE="https://www.gnu.org/software/units/units.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+units--cur"
+REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	sys-libs/readline:=
+	units--cur? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.17-network-sandbox.patch
+	"${FILESDIR}"/${PN}-2.20-WIN32.patch
+	"${FILESDIR}"/${PN}-2.20-readerror.patch
+)
+DOCS=(
+	ChangeLog NEWS README
+)
+
+pkg_setup() {
+	use units--cur && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--sharedstatedir="${EROOT}/var/lib" \
+		ac_cv_path_PYTHON=no
+}
+
+src_compile() {
+	emake ${PN}
+}
+
+src_install() {
+	default
+
+	# we're intentionally delaying this since 'make install' would
+	# get confused if we shove 'units_cur' there, and there is no real
+	# need to add more complexity for it
+	if use units--cur; then
+		sed \
+			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
+			-e 's|^#!|&/usr/bin/python|g' \
+			units_cur_inst > units_cur || die
+		python_fix_shebang units_cur
+		python_doscript units_cur
+	fi
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/, sci-calculators/units/files/
@ 2021-02-12 13:49 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-02-12 13:49 UTC (permalink / raw
  To: gentoo-commits

commit:     6bcb78c4c5267464584160e4a53c623e2442f66b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 13:49:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 13:49:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bcb78c4

sci-calculators/units: cleanup old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-calculators/units/Manifest                     |  1 -
 sci-calculators/units/files/units-2.20-WIN32.patch | 24 ---------
 sci-calculators/units/units-2.20.ebuild            | 60 ----------------------
 3 files changed, 85 deletions(-)

diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 551e57acabc..62a5de36de3 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,2 +1 @@
-DIST units-2.20.tar.gz 1309242 BLAKE2B 5321e6234cfe4514d1ebccec490e472ff64a0428bb2721f51e3ff626ddef7eec4b4e8822aa947da1f4ddca414078b617ba34308c86a71788f6d8a9ba20dd6846 SHA512 5292588fb7ea0ab12e45e5521a115a0eaba4e37378011677cbd80e6e17a6ffa5f388a57859c590b6d65460fc91a4ff33e6603e27d4909b8122d4ad3696c8600d
 DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62

diff --git a/sci-calculators/units/files/units-2.20-WIN32.patch b/sci-calculators/units/files/units-2.20-WIN32.patch
deleted file mode 100644
index fbe7599831c..00000000000
--- a/sci-calculators/units/files/units-2.20-WIN32.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/units.c
-+++ b/units.c
-@@ -4087,7 +4087,9 @@
- checkcwd (char *file)
- {
-   FILE *fp;
-+#ifdef _WIN32
-   char *p;
-+#endif
- 
-   fp = fopen(file, "r");
-   if (fp){
-@@ -4630,7 +4630,10 @@
- printversion()
- {
-   int exists;
--  char *unitsfile, *localemap;
-+  char *unitsfile;
-+#ifdef _WIN32
-+  char *localemap;
-+#endif
- 
-   if (flags.verbose == 0) {
-     printf("GNU Units version %s\n", VERSION);

diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild
deleted file mode 100644
index f63f622a041..00000000000
--- a/sci-calculators/units/units-2.20.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit python-r1
-
-DESCRIPTION="Unit conversion program"
-HOMEPAGE="https://www.gnu.org/software/units/units.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.3 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+units-cur"
-REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sys-libs/readline:=
-	units-cur? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.17-network-sandbox.patch
-	"${FILESDIR}"/${PN}-2.20-WIN32.patch
-	"${FILESDIR}"/${PN}-2.20-readerror.patch
-)
-DOCS=(
-	ChangeLog NEWS README
-)
-
-src_configure() {
-	econf \
-		--sharedstatedir="${EPREFIX}"/var/lib \
-		ac_cv_path_PYTHON=no
-}
-
-src_compile() {
-	emake ${PN}
-}
-
-src_install() {
-	default
-
-	if use units-cur; then
-		sed \
-			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
-			-e 's|^#!|&/usr/bin/python|g' \
-			units_cur_inst > units_cur || die
-		python_foreach_impl python_doscript units_cur
-	fi
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/, sci-calculators/units/files/
@ 2024-06-06  5:20 Viorel Munteanu
  0 siblings, 0 replies; 5+ messages in thread
From: Viorel Munteanu @ 2024-06-06  5:20 UTC (permalink / raw
  To: gentoo-commits

commit:     104a173ced00addda98e202c87337fdd97219363
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 05:11:37 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 05:20:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=104a173c

sci-calculators/units: drop 2.21-r1

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 sci-calculators/units/Manifest                     |  1 -
 .../units/files/units-2.17-network-sandbox.patch   | 11 -----
 sci-calculators/units/units-2.21-r1.ebuild         | 57 ----------------------
 3 files changed, 69 deletions(-)

diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 2f123aa654f9..0dcbf6be4c02 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,2 +1 @@
-DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62
 DIST units-2.23.tar.gz 1423494 BLAKE2B 9a835ec3862b7c09149d5726084fb3068acb9d01b3a8234647cd47805a559b75131046bfe407152dec9f2e06c6c3315686dd0db0694d2c5ef0173e6ee64ce378 SHA512 628aac3a560ed728f1aba91841f9fccc0b145375a0b8953b98ac00c71bcc7f647377d16c6ba7b59e987a6e7a74b44038a62f2576f757a43d7564be469be81ee8

diff --git a/sci-calculators/units/files/units-2.17-network-sandbox.patch b/sci-calculators/units/files/units-2.17-network-sandbox.patch
deleted file mode 100644
index e457610e430a..000000000000
--- a/sci-calculators/units/files/units-2.17-network-sandbox.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -107,7 +107,7 @@
-             -e "s@/usr/bin/python@$(PYTHON)@" \
-              $(srcdir)/units_cur > units_cur_inst
- 
--install-support: definitions.units units_cur_inst currency-units-update
-+install-support: definitions.units units_cur_inst
- 	$(MKDIR_P) $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) $(DESTDIR)@CDAT@
- 	$(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@definitions.units
- 	-rm -f $(DESTDIR)@UDAT@currency.units

diff --git a/sci-calculators/units/units-2.21-r1.ebuild b/sci-calculators/units/units-2.21-r1.ebuild
deleted file mode 100644
index 4fd1ba750a36..000000000000
--- a/sci-calculators/units/units-2.21-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit python-r1
-
-DESCRIPTION="Unit conversion program"
-HOMEPAGE="https://www.gnu.org/software/units/units.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.3 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+units-cur"
-REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sys-libs/readline:=
-	units-cur? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/requests[${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.17-network-sandbox.patch
-	"${FILESDIR}"/${PN}-2.20-readerror.patch
-)
-
-DOCS=( ChangeLog NEWS README )
-
-src_configure() {
-	econf \
-		--sharedstatedir="${EPREFIX}"/var/lib \
-		ac_cv_path_PYTHON=no
-}
-
-src_compile() {
-	emake ${PN}
-}
-
-src_install() {
-	default
-
-	if use units-cur; then
-		sed \
-			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
-			-e 's|^#!|&/usr/bin/python|g' \
-			units_cur_inst > units_cur || die
-		python_foreach_impl python_doscript units_cur
-	fi
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-06-06  5:20 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-01  8:05 [gentoo-commits] repo/gentoo:master commit in: sci-calculators/units/, sci-calculators/units/files/ Jeroen Roovers
  -- strict thread matches above, loose matches on Subject: below --
2024-06-06  5:20 Viorel Munteanu
2021-02-12 13:49 Sam James
2018-06-26 19:21 Jeroen Roovers
2016-09-05  4:44 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox