diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2024-10-31 21:01:26 +0100 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2024-10-31 21:04:04 +0100 |
commit | ed7ebaab7fee1fbbceee7a15e56cc154111cb794 (patch) | |
tree | 03fe23c9c77d061cab17919b49d5b095559968ad /net-libs/pacparser | |
parent | app-editors/bluefish: drop 2.2.12-r2, 2.2.13 (diff) | |
download | gentoo-ed7ebaab7fee1fbbceee7a15e56cc154111cb794.tar.gz gentoo-ed7ebaab7fee1fbbceee7a15e56cc154111cb794.tar.bz2 gentoo-ed7ebaab7fee1fbbceee7a15e56cc154111cb794.zip |
net-libs/pacparser: drop 1.4.0, 1.4.2
Bug: https://bugs.gentoo.org/919375
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Diffstat (limited to 'net-libs/pacparser')
-rw-r--r-- | net-libs/pacparser/Manifest | 2 | ||||
-rw-r--r-- | net-libs/pacparser/files/pacparser-1.4.0-build.patch | 96 | ||||
-rw-r--r-- | net-libs/pacparser/files/pacparser-1.4.0-pymod.patch | 61 | ||||
-rw-r--r-- | net-libs/pacparser/pacparser-1.4.0.ebuild | 70 | ||||
-rw-r--r-- | net-libs/pacparser/pacparser-1.4.2.ebuild | 66 |
5 files changed, 0 insertions, 295 deletions
diff --git a/net-libs/pacparser/Manifest b/net-libs/pacparser/Manifest index b3e20146ec71..93960be6fac2 100644 --- a/net-libs/pacparser/Manifest +++ b/net-libs/pacparser/Manifest @@ -1,4 +1,2 @@ -DIST pacparser-1.4.0.tar.gz 902919 BLAKE2B da29b34654764b1569d9d37648e4ccb608142becaf34c65cdf37b2bd81aa073b1945d840fb50aa7cb986687bbdc086c862a05bc421adb08d44e1add637b712ed SHA512 9574068dc4da3db27ddc1242cf98d98ebc7515864789e95b700cd2ce1433a7cff84160f1507976488fab7529839cabe9cf2aa16ddbefc0c83009fa6c0d2ad6b3 -DIST pacparser-1.4.2.tar.gz 903425 BLAKE2B 6b46fd87487feacb3915ddd3705eb60f795257adc5361fddbfc550c537471276f464f367b57124efc49f57666f232c297df763f2adea34d7642bd1e3271f47b4 SHA512 65d12421ee79a969b867d7dcec1527ac9b2596c25f6be2502742ba1b3788f05afeed2fcd5406dfb39485d1d56ef161684acabe6a95008725385c3c5336f331b1 DIST pacparser-1.4.3.tar.gz 905231 BLAKE2B bffe42154a8de9798c4c7b986e5797c19cbb103ed2977545014278f63a770c7cd9ed6b7fc6a9fff96514a71457b9dbc35104a51d9e5e331e2d19f3baeb86e621 SHA512 cc0d6c0a7b1fd9d55dece6c4ad80711d3d1055a0cde120dbb6e8274508631b325e7d876545b40ca05cefc6dce15aa1476e5b2936527e3183ad86114e4cd661a5 DIST pacparser-1.4.5.tar.gz 905331 BLAKE2B 4c0346e76ad86a6fc54d870688595432f36fc535564b79edc74816f0fa2c45be109c4734d36af5ded50ac208177cfe9fc775d0917060e3f2b4ea5445da67b077 SHA512 fabbfa5c5ebd2a884187e53db27015b16587cba2ae30da1fdec92ca211b1f0ecd2839222341cd0eca9e709ada4e9efcd686b713e4f1e5621507070a6300ad164 diff --git a/net-libs/pacparser/files/pacparser-1.4.0-build.patch b/net-libs/pacparser/files/pacparser-1.4.0-build.patch deleted file mode 100644 index 2a8898579327..000000000000 --- a/net-libs/pacparser/files/pacparser-1.4.0-build.patch +++ /dev/null @@ -1,96 +0,0 @@ -Upstream-PR: https://github.com/manugarg/pacparser/pull/136 -From 5d689be2e250242ef4022054f11bf00af339c149 Mon Sep 17 00:00:00 2001 -From: orbea <orbea@riseup.net> -Date: Fri, 13 May 2022 22:34:37 -0700 -Subject: [PATCH 1/2] build: Don't conflict with the user's CFLAGS - -This uses the variable MAINT_CFLAGS to set the project's flags so that -the user can set CFLAGS as an environment variable or as an make -argument without any conflicts. - -This can be problemtic with the build environment in some distros. ---- - src/Makefile | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 87f5c1b..3642241 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -60,14 +60,14 @@ ifeq ($(OS_ARCH),Darwin) - endif - - PREFIX ?= /usr --CFLAGS = -g -DXP_UNIX -Wall -DVERSION=$(VERSION) -+MAINT_CFLAGS := -g -DXP_UNIX -Wall -DVERSION=$(VERSION) - - ifndef PYTHON - PYTHON = python - endif - - # Spidermonkey library. --CFLAGS += -Ispidermonkey/js/src -+MAINT_CFLAGS += -Ispidermonkey/js/src - - LIBRARY_LINK = $(LIBRARY_NAME).$(SO_SUFFIX) - PREFIX := $(DESTDIR)$(PREFIX) -@@ -87,17 +87,17 @@ spidermonkey/libjs.a: spidermonkey/js/src - cd spidermonkey && SMCFLAGS="$(SHFLAGS) $(SMCFLAGS)" $(MAKE) jslib - - pacparser.o: pacparser.c pac_utils.h pacparser.h jsapi_buildstamp -- $(CC) $(CFLAGS) $(SHFLAGS) -c pacparser.c -o pacparser.o -+ $(CC) $(MAINT_CFLAGS) $(CFLAGS) $(SHFLAGS) -c pacparser.c -o pacparser.o - touch pymod/pacparser_o_buildstamp - - $(LIBRARY): pacparser.o spidermonkey/libjs.a -- $(MKSHLIB) $(CFLAGS) $(LDFLAGS) $(LIB_OPTS) -o $(LIBRARY) pacparser.o spidermonkey/libjs.a -lm -+ $(MKSHLIB) $(MAINT_CFLAGS) $(CFLAGS) $(LDFLAGS) $(LIB_OPTS) -o $(LIBRARY) pacparser.o spidermonkey/libjs.a -lm - - $(LIBRARY_LINK): $(LIBRARY) - ln -sf $(LIBRARY) $(LIBRARY_LINK) - - pactester: pactester.c pacparser.h pacparser.o spidermonkey/libjs.a -- $(CC) $(CFLAGS) $(LDFLAGS) pactester.c pacparser.o spidermonkey/libjs.a -o pactester -lm -L. -I. -+ $(CC) $(MAINT_CFLAGS) $(CFLAGS) $(LDFLAGS) pactester.c pacparser.o spidermonkey/libjs.a -o pactester -lm -L. -I. - - testpactester: pactester $(LIBRARY_LINK) - echo "Running tests for pactester." - -From ff86f230de5dd60935e1793077eb038fcbe1e515 Mon Sep 17 00:00:00 2001 -From: orbea <orbea@riseup.net> -Date: Fri, 13 May 2022 22:45:19 -0700 -Subject: [PATCH 2/2] build: Add DOC_PREFIX - -This can be useful for distro integration. ---- - src/Makefile | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 3642241..af10890 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -74,6 +74,7 @@ PREFIX := $(DESTDIR)$(PREFIX) - LIB_PREFIX = $(PREFIX)/lib - INC_PREFIX = $(PREFIX)/include - BIN_PREFIX = $(PREFIX)/bin -+DOC_PREFIX = $(PREFIX)/share/doc/pacparser - MAN_PREFIX = $(PREFIX)/share/man - - .PHONY: clean pymod install-pymod -@@ -119,11 +120,11 @@ install: all - install -d $(MAN_PREFIX)/man3/ - (test -d ../docs && install -m 644 ../docs/man/man3/*.3 $(MAN_PREFIX)/man3/) || true - # install html docs -- install -d $(PREFIX)/share/doc/pacparser/html/ -- (test -d ../docs/html && install -m 644 ../docs/html/* $(PREFIX)/share/doc/pacparser/html/) || true -+ install -d $(DOC_PREFIX)/html/ -+ (test -d ../docs/html && install -m 644 ../docs/html/* $(DOC_PREFIX)/html/) || true - # install examples -- install -d $(PREFIX)/share/doc/pacparser/examples/ -- (test -d ../examples && install -m 644 ../examples/* $(PREFIX)/share/doc//pacparser/examples/) || true -+ install -d $(DOC_PREFIX)/examples/ -+ (test -d ../examples && install -m 644 ../examples/* $(DOC_PREFIX)/examples/) || true - - # Targets to build python module - pymod: pacparser.o pacparser.h spidermonkey/libjs.a diff --git a/net-libs/pacparser/files/pacparser-1.4.0-pymod.patch b/net-libs/pacparser/files/pacparser-1.4.0-pymod.patch deleted file mode 100644 index 203e34c838f1..000000000000 --- a/net-libs/pacparser/files/pacparser-1.4.0-pymod.patch +++ /dev/null @@ -1,61 +0,0 @@ -Upstream-PR: https://github.com/manugarg/pacparser/pull/137 -From 351b8f837ebbdf6e6fa4978a70287899436890eb Mon Sep 17 00:00:00 2001 -From: orbea <orbea@riseup.net> -Date: Sat, 14 May 2022 01:46:25 -0700 -Subject: [PATCH] tests: Fix python path in runtests.py - -In Gentoo the runtests.py script fails when it fails to determine the -pacparser path. - -This happens because 'py_ver' expands to '3.9' when the expected -directory ends in '39'. This can be solved by replacing any periods in -the string. - -python ../tests/runtests.py -Traceback (most recent call last): - File "/tmp/pacparser/src/../tests/runtests.py", line 31, in runtests - pacparser_module_path = glob.glob(os.path.join( -IndexError: list index out of range - -During handling of the above exception, another exception occurred: - -Traceback (most recent call last): - File "/tmp/pacparser/src/../tests/runtests.py", line 81, in <module> - main() - File "/tmp/pacparser/src/../tests/runtests.py", line 78, in main - runtests(pacfile, testdata, tests_dir) - File "/tmp/pacparser/src/../tests/runtests.py", line 34, in runtests - raise Exception('Tests failed. Could not determine pacparser path.') -Exception: Tests failed. Could not determine pacparser path. ---- - tests/runtests.py | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/tests/runtests.py b/tests/runtests.py -index 9760300..a5377d1 100644 ---- a/tests/runtests.py -+++ b/tests/runtests.py -@@ -26,10 +26,20 @@ - import sys - - def runtests(pacfile, testdata, tests_dir): -- py_ver = '.'.join([str(x) for x in sys.version_info[0:2]]) -+ ver = '.'.join([str(x) for x in sys.version_info[0:2]]) -+ py_ver = [ver, ver.replace('.', '')] - try: -- pacparser_module_path = glob.glob(os.path.join( -- tests_dir, '..', 'src', 'pymod', 'build', 'lib*%s' % py_ver))[0] -+ module_path = glob.glob(os.path.join( -+ tests_dir, '..', 'src', 'pymod', 'build', 'lib*')) -+ module_found = False -+ for module in module_path: -+ for version in py_ver: -+ if module.endswith(version): -+ module_found = True -+ break -+ if module_found: -+ pacparser_module_path = module -+ break - except Exception: - raise Exception('Tests failed. Could not determine pacparser path.') - if 'DEBUG' in os.environ: print('Pacparser module path: %s' % diff --git a/net-libs/pacparser/pacparser-1.4.0.ebuild b/net-libs/pacparser/pacparser-1.4.0.ebuild deleted file mode 100644 index 04d6f5b11bde..000000000000 --- a/net-libs/pacparser/pacparser-1.4.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9,10,11} ) - -inherit python-r1 toolchain-funcs - -DESCRIPTION="Library to parse proxy auto-config files" -HOMEPAGE="http://pacparser.manugarg.com/" -SRC_URI="https://github.com/manugarg/${PN}/archive/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/1" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="doc python" - -DEPEND="python? ( ${PYTHON_DEPS} )" -RDEPEND="${DEPEND}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# spidermonkey-1.7.0 is bundled -# tested unbundling with spidermonkey-1.8* and 1.7 -# and got many failures: unbundling not worth it. - -PATCHES=( - "${FILESDIR}/${P}-build.patch" - "${FILESDIR}/${P}-pymod.patch" -) - -src_prepare() { - default - - sed -e '/CC = gcc/d' \ - -i src/spidermonkey/js/src/config/Linux_All.mk || die - - export NO_INTERNET=yes - export VERSION="${PV}" - tc-export CC AR RANLIB -} - -src_compile() { - # Upstream parallel compilation bug, do that first to work around - emake -C src/spidermonkey - emake -C src - use python && python_foreach_impl emake -C src pymod -} - -src_install() { - emake \ - LIB_PREFIX="${ED}/usr/$(get_libdir)" \ - DOC_PREFIX="${ED}/usr/share/doc/${PF}" \ - BIN_PREFIX="${ED}"/usr/bin \ - INC_PREFIX="${ED}"/usr/include \ - MAN_PREFIX="${ED}"/usr/share/man \ - -C src install - dodoc README.md - - if use python; then - python_foreach_impl emake DESTDIR="${D}" -C src install-pymod - python_foreach_impl python_optimize - fi - - if use doc; then - docompress -x /usr/share/doc/${PF}/{html,examples} - else - rm -r "${ED}"/usr/share/doc/${PF}/{html,examples} || die - fi -} diff --git a/net-libs/pacparser/pacparser-1.4.2.ebuild b/net-libs/pacparser/pacparser-1.4.2.ebuild deleted file mode 100644 index 87e64cf6c25f..000000000000 --- a/net-libs/pacparser/pacparser-1.4.2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) - -inherit python-r1 toolchain-funcs - -DESCRIPTION="Library to parse proxy auto-config files" -HOMEPAGE="http://pacparser.manugarg.com/" -SRC_URI="https://github.com/manugarg/${PN}/archive/v${PV}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/1" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc python" - -DEPEND="python? ( ${PYTHON_DEPS} )" -RDEPEND="${DEPEND}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# spidermonkey-1.7.0 is bundled -# tested unbundling with spidermonkey-1.8* and 1.7 -# and got many failures: unbundling not worth it. - -src_prepare() { - default - - sed -e 's/^SMCFLAGS.*/SMCFLAGS = -DHAVE_VA_COPY -DVA_COPY=va_copy -DHAVE_VA_LIST_AS_ARRAY/' \ - -i src/Makefile || die - sed -e '/CC = gcc/d' \ - -i src/spidermonkey/js/src/config/Linux_All.mk || die - - export NO_INTERNET=yes - export VERSION="${PV}" - tc-export CC AR RANLIB -} - -src_compile() { - # Upstream parallel compilation bug, do that first to work around - emake -C src -j1 - use python && python_foreach_impl emake -C src pymod -} - -src_install() { - emake \ - LIB_PREFIX="${ED}/usr/$(get_libdir)" \ - DOC_PREFIX="${ED}/usr/share/doc/${PF}" \ - BIN_PREFIX="${ED}"/usr/bin \ - INC_PREFIX="${ED}"/usr/include \ - MAN_PREFIX="${ED}"/usr/share/man \ - -C src install - dodoc README.md - - if use python; then - python_foreach_impl emake DESTDIR="${D}" -C src install-pymod - python_foreach_impl python_optimize - fi - - if use doc; then - docompress -x /usr/share/doc/${PF}/{html,examples} - else - rm -r "${ED}"/usr/share/doc/${PF}/{html,examples} || die - fi -} |