Attachment #246720 for bug #275479

View | Details | Raw Unified | Return to bug 275479
Collapse All | Expand All




PORTNAME=	adblock
DISTVERSION=	0.6.0
PORTREVISION=	51
CATEGORIES=	www python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}


GH_PROJECT=	python-adblock
USE_PYTHON=	autoplist concurrent cython distutils

CARGO_CRATES=	adblock-0.5.6 \
		addr-0.14.0 \
		adler-1.0.2 \
		aho-corasick-0.7.18 \
		autocfg-1.1.0 \
		base64-0.13.0 \
		bitflags-1.3.2 \
		byteorder-1.4.3 \
		cfg-if-1.0.0 \
		crc32fast-1.3.2 \
		either-1.7.0 \
		flate2-1.0.24 \
		flate2-1.0.20 \
		form_urlencoded-1.0.1 \
		idna-0.2.3 \
		indoc-1.0.6 \
		itertools-0.10.3 \
		libc-0.2.126 \
		lock_api-0.4.7 \
		matches-0.1.9 \
		memchr-2.5.0 \
		miniz_oxide-0.5.3 \
		num-traits-0.2.15 \
		once_cell-1.13.0 \
		parking_lot-0.12.1 \
		parking_lot_core-0.9.3 \
		paste-1.0.7 \
		num-traits-0.2.14 \
		once_cell-1.7.2 \
		parking_lot-0.11.1 \
		parking_lot_core-0.8.3 \
		paste-0.1.18 \
		paste-impl-0.1.18 \
		percent-encoding-2.1.0 \
		proc-macro2-1.0.40 \
		psl-2.0.90 \
		psl-types-2.0.10 \
		pyo3-0.16.5 \
		pyo3-build-config-0.16.5 \
		pyo3-ffi-0.16.5 \
		pyo3-macros-0.16.5 \
		pyo3-macros-backend-0.16.5 \
		quote-1.0.20 \
		redox_syscall-0.2.13 \
		regex-1.6.0 \
		regex-syntax-0.6.27 \
		rmp-0.8.11 \
		rmp-serde-0.13.7 \
		rmp-serde-0.15.5 \
		scopeguard-1.1.0 \
		seahash-3.0.7 \
		serde-1.0.139 \
		serde_derive-1.0.139 \
		smallvec-1.9.0 \
		syn-1.0.98 \
		target-lexicon-0.12.4 \
		tinyvec-1.6.0 \
		tinyvec_macros-0.1.0 \
		twoway-0.2.2 \
		unchecked-index-0.2.2 \
		unicode-bidi-0.3.8 \
		unicode-ident-1.0.2 \
		unicode-normalization-0.1.21 \
		unindent-0.1.9 \
		url-2.2.2 \
		windows-sys-0.36.1 \
		windows_aarch64_msvc-0.36.1 \
		windows_i686_gnu-0.36.1 \
		windows_i686_msvc-0.36.1 \
		windows_x86_64_gnu-0.36.1 \
		windows_x86_64_msvc-0.36.1
CARGO_BUILD=		no
CARGO_INSTALL=		no
CARGO_TARGET_DIR=	${WRKSRC}/target

do-build:
	@(cd ${BUILD_WRKSRC} ; \
		PSL_PATH="${PREFIX}/share/public_suffix_list/public_suffix_list.dat" \
		${SETENV} ${MAKE_ENV} maturin-${PYTHON_VER} build --release \
		${WITH_DEBUG:D:U--strip})

# Due to upstream not supplying a setup.py file or other way to install
# using pip command for now...
do-install:
.if ${ARCH:Mpowerpc64*}
	@(cd ${INSTALL_WRKSRC}; \
		${FIND} . -name "*whl" -exec ${SH} -c 'mv {} `echo {} | ${SED}  -E -e "s/powerpc.*/powerpc.whl/"`' \
		\;)
.endif
	@(cd ${INSTALL_WRKSRC} ; \
		${INSTALL_DATA} "target/release/libadblock.so" \
		"${STAGEDIR}/${PREFIX}/lib" ; \
		${SETENV} ${MAKE_ENV} pip-${PYTHON_VER} install --isolated \
		--root=${STAGEDIR} --ignore-installed --no-deps target/wheels/*.whl)

post-install:
	(cd ${STAGEDIR}${PREFIX} && \

# contains only the EGG files as a whole.
# SEE devel/py-maturin/Makefile
	@${FIND} ${STAGEDIR} \
		-type \
		f \
		-o \
		-type \
		l | \
		${SORT} | \
		${SED} -e 's|${STAGEDIR}||' \
		> \
		${WRKDIR}/.PLIST.pymodtmp

.include <bsd.port.mk>




TIMESTAMP = 1701242170
SHA256 (rust/crates/adblock-0.5.6.crate) = 27785ef5b89bc88fd2def3e1ecfefdf5ec1583795b916667afd15b13058f8315
SIZE (rust/crates/adblock-0.5.6.crate) = 7704188
SHA256 (rust/crates/addr-0.14.0.crate) = c54ccac949a2afafdfc889e15c753bbc6ee8783e026bbe3d057b00b13907db70
SIZE (rust/crates/addr-0.14.0.crate) = 90210
SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
SIZE (rust/crates/adler-1.0.2.crate) = 12778
SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f
SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923
SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
SHA256 (rust/crates/base64-0.13.0.crate) = 904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd
SIZE (rust/crates/base64-0.13.0.crate) = 62070
SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610
SIZE (rust/crates/byteorder-1.4.3.crate) = 22512
SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d
SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661
SHA256 (rust/crates/either-1.7.0.crate) = 3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be
SIZE (rust/crates/either-1.7.0.crate) = 15492
SHA256 (rust/crates/flate2-1.0.24.crate) = f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6
SIZE (rust/crates/flate2-1.0.24.crate) = 70191
SHA256 (rust/crates/flate2-1.0.20.crate) = cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0
SIZE (rust/crates/flate2-1.0.20.crate) = 74036
SHA256 (rust/crates/form_urlencoded-1.0.1.crate) = 5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191
SIZE (rust/crates/form_urlencoded-1.0.1.crate) = 8773
SHA256 (rust/crates/idna-0.2.3.crate) = 418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8
SIZE (rust/crates/idna-0.2.3.crate) = 271023
SHA256 (rust/crates/indoc-1.0.6.crate) = 05a0bd019339e5d968b37855180087b7b9d512c5046fbd244cf8c95687927d6e
SIZE (rust/crates/indoc-1.0.6.crate) = 14312
SHA256 (rust/crates/itertools-0.10.3.crate) = a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3
SIZE (rust/crates/itertools-0.10.3.crate) = 118661
SHA256 (rust/crates/libc-0.2.126.crate) = 349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836
SIZE (rust/crates/libc-0.2.126.crate) = 590481
SHA256 (rust/crates/lock_api-0.4.7.crate) = 327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53
SIZE (rust/crates/lock_api-0.4.7.crate) = 25371
SHA256 (rust/crates/matches-0.1.9.crate) = a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f
SIZE (rust/crates/matches-0.1.9.crate) = 2246
SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
SIZE (rust/crates/memchr-2.5.0.crate) = 65812
SHA256 (rust/crates/miniz_oxide-0.5.3.crate) = 6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc
SIZE (rust/crates/miniz_oxide-0.5.3.crate) = 53452
SHA256 (rust/crates/num-traits-0.2.15.crate) = 578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd
SIZE (rust/crates/num-traits-0.2.15.crate) = 49262
SHA256 (rust/crates/once_cell-1.13.0.crate) = 18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1
SIZE (rust/crates/once_cell-1.13.0.crate) = 31726
SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
SHA256 (rust/crates/parking_lot_core-0.9.3.crate) = 09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929
SIZE (rust/crates/parking_lot_core-0.9.3.crate) = 32256
SHA256 (rust/crates/paste-1.0.7.crate) = 0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc
SIZE (rust/crates/paste-1.0.7.crate) = 18285
SHA256 (rust/crates/num-traits-0.2.14.crate) = 9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290
SIZE (rust/crates/num-traits-0.2.14.crate) = 45476
SHA256 (rust/crates/once_cell-1.7.2.crate) = af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3
SIZE (rust/crates/once_cell-1.7.2.crate) = 28250
SHA256 (rust/crates/parking_lot-0.11.1.crate) = 6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb
SIZE (rust/crates/parking_lot-0.11.1.crate) = 39854
SHA256 (rust/crates/parking_lot_core-0.8.3.crate) = fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018
SIZE (rust/crates/parking_lot_core-0.8.3.crate) = 32147
SHA256 (rust/crates/paste-0.1.18.crate) = 45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880
SIZE (rust/crates/paste-0.1.18.crate) = 12259
SHA256 (rust/crates/paste-impl-0.1.18.crate) = d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6
SIZE (rust/crates/paste-impl-0.1.18.crate) = 9451
SHA256 (rust/crates/percent-encoding-2.1.0.crate) = d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e
SIZE (rust/crates/percent-encoding-2.1.0.crate) = 9748
SHA256 (rust/crates/proc-macro2-1.0.40.crate) = dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7
SIZE (rust/crates/proc-macro2-1.0.40.crate) = 40559
SHA256 (rust/crates/psl-2.0.90.crate) = 7e9c7d362659b525758d09e2a3ae965e371b347605e5fb2bc5bec5c2a1ecf41b
SIZE (rust/crates/psl-2.0.90.crate) = 188750
SHA256 (rust/crates/psl-types-2.0.10.crate) = e8eda7c62d9ecaafdf8b62374c006de0adf61666ae96a96ba74a37134aa4e470
SIZE (rust/crates/psl-types-2.0.10.crate) = 7929
SHA256 (rust/crates/pyo3-0.16.5.crate) = 1e6302e85060011447471887705bb7838f14aba43fcb06957d823739a496b3dc
SIZE (rust/crates/pyo3-0.16.5.crate) = 363266
SHA256 (rust/crates/pyo3-build-config-0.16.5.crate) = b5b65b546c35d8a3b1b2f0ddbac7c6a569d759f357f2b9df884f5d6b719152c8
SIZE (rust/crates/pyo3-build-config-0.16.5.crate) = 28880
SHA256 (rust/crates/pyo3-ffi-0.16.5.crate) = c275a07127c1aca33031a563e384ffdd485aee34ef131116fcd58e3430d1742b
SIZE (rust/crates/pyo3-ffi-0.16.5.crate) = 60737
SHA256 (rust/crates/pyo3-macros-0.16.5.crate) = 284fc4485bfbcc9850a6d661d627783f18d19c2ab55880b021671c4ba83e90f7
SIZE (rust/crates/pyo3-macros-0.16.5.crate) = 8456
SHA256 (rust/crates/pyo3-macros-backend-0.16.5.crate) = 53bda0f58f73f5c5429693c96ed57f7abdb38fdfc28ae06da4101a257adb7faf
SIZE (rust/crates/pyo3-macros-backend-0.16.5.crate) = 49221
SHA256 (rust/crates/quote-1.0.20.crate) = 3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804
SIZE (rust/crates/quote-1.0.20.crate) = 28160
SHA256 (rust/crates/redox_syscall-0.2.13.crate) = 62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42
SIZE (rust/crates/redox_syscall-0.2.13.crate) = 23759
SHA256 (rust/crates/regex-1.6.0.crate) = 4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b
SIZE (rust/crates/regex-1.6.0.crate) = 239329
SHA256 (rust/crates/regex-syntax-0.6.27.crate) = a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244
SIZE (rust/crates/regex-syntax-0.6.27.crate) = 297300
SHA256 (rust/crates/rmp-0.8.11.crate) = 44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f
SIZE (rust/crates/rmp-0.8.11.crate) = 28829
SHA256 (rust/crates/rmp-serde-0.13.7.crate) = 011e1d58446e9fa3af7cdc1fb91295b10621d3ac4cb3a85cc86385ee9ca50cd3
SIZE (rust/crates/rmp-serde-0.13.7.crate) = 16676
SHA256 (rust/crates/rmp-serde-0.15.5.crate) = 723ecff9ad04f4ad92fe1c8ca6c20d2196d9286e9c60727c4cb5511629260e9d
SIZE (rust/crates/rmp-serde-0.15.5.crate) = 28657
SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
SHA256 (rust/crates/seahash-3.0.7.crate) = 58f57ca1d128a43733fd71d583e837b1f22239a37ebea09cde11d8d9a9080f47
SIZE (rust/crates/seahash-3.0.7.crate) = 28697
SHA256 (rust/crates/serde-1.0.139.crate) = 0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6
SIZE (rust/crates/serde-1.0.139.crate) = 76405
SHA256 (rust/crates/serde_derive-1.0.139.crate) = dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb
SIZE (rust/crates/serde_derive-1.0.139.crate) = 54848
SHA256 (rust/crates/smallvec-1.9.0.crate) = 2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1
SIZE (rust/crates/smallvec-1.9.0.crate) = 28396
SHA256 (rust/crates/syn-1.0.98.crate) = c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd
SIZE (rust/crates/syn-1.0.98.crate) = 235451
SHA256 (rust/crates/target-lexicon-0.12.4.crate) = c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1
SIZE (rust/crates/target-lexicon-0.12.4.crate) = 23020
SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
SHA256 (rust/crates/tinyvec_macros-0.1.0.crate) = cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c
SIZE (rust/crates/tinyvec_macros-0.1.0.crate) = 1817
SHA256 (rust/crates/twoway-0.2.2.crate) = c57ffb460d7c24cd6eda43694110189030a3d1dfe418416d9468fd1c1d290b47
SIZE (rust/crates/twoway-0.2.2.crate) = 30454
SHA256 (rust/crates/unchecked-index-0.2.2.crate) = eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c
SIZE (rust/crates/unchecked-index-0.2.2.crate) = 8325
SHA256 (rust/crates/unicode-bidi-0.3.8.crate) = 099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992
SIZE (rust/crates/unicode-bidi-0.3.8.crate) = 36575
SHA256 (rust/crates/unicode-ident-1.0.2.crate) = 15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7
SIZE (rust/crates/unicode-ident-1.0.2.crate) = 34951
SHA256 (rust/crates/unicode-normalization-0.1.21.crate) = 854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6
SIZE (rust/crates/unicode-normalization-0.1.21.crate) = 121745
SHA256 (rust/crates/unindent-0.1.9.crate) = 52fee519a3e570f7df377a06a1a7775cdbfb7aa460be7e08de2b1f0e69973a44
SIZE (rust/crates/unindent-0.1.9.crate) = 8392
SHA256 (rust/crates/url-2.2.2.crate) = a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c
SIZE (rust/crates/url-2.2.2.crate) = 68555
SHA256 (rust/crates/windows-sys-0.36.1.crate) = ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2
SIZE (rust/crates/windows-sys-0.36.1.crate) = 3347053
SHA256 (rust/crates/windows_aarch64_msvc-0.36.1.crate) = 9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47
SIZE (rust/crates/windows_aarch64_msvc-0.36.1.crate) = 661960
SHA256 (rust/crates/windows_i686_gnu-0.36.1.crate) = 180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6
SIZE (rust/crates/windows_i686_gnu-0.36.1.crate) = 818115
SHA256 (rust/crates/windows_i686_msvc-0.36.1.crate) = e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024
SIZE (rust/crates/windows_i686_msvc-0.36.1.crate) = 724575
SHA256 (rust/crates/windows_x86_64_gnu-0.36.1.crate) = 4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1
SIZE (rust/crates/windows_x86_64_gnu-0.36.1.crate) = 790934
SHA256 (rust/crates/windows_x86_64_msvc-0.36.1.crate) = c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680
SIZE (rust/crates/windows_x86_64_msvc-0.36.1.crate) = 661999
SHA256 (ArniDagur-python-adblock-0.6.0_GH0.tar.gz) = cdde5db640f1d9205785641665b79e6edb7c51092a68536bc4907560c71136b2
SIZE (ArniDagur-python-adblock-0.6.0_GH0.tar.gz) = 24976




--- Cargo.toml.orig	2023-11-30 00:15:19 UTC
+++ Cargo.toml
@@ -9,15 +9,6 @@ repository = "https://github.com/ArniDagur/python-adbl
 homepage = "https://github.com/ArniDagur/python-adblock"
 repository = "https://github.com/ArniDagur/python-adblock"

-[package.metadata.maturin]
-classifier = [
-    "Programming Language :: Python",
-    "Programming Language :: Rust",
-    "License :: OSI Approved :: MIT License",
-    "License :: OSI Approved :: Apache Software License",
-]
-requires-python = ">=3.7"
-
 [profile.release]
 debug = true




Obtained from:	https://github.com/ArniDagur/python-adblock/commit/7597cd0b841a0ede22ff4cec6b4b91fb7d26a805

--- Cargo.toml.orig	2021-06-26 20:50:00 UTC
+++ Cargo.toml
@@ -9,15 +9,6 @@ readme = "README.md"
 homepage = "https://github.com/ArniDagur/python-adblock"
 repository = "https://github.com/ArniDagur/python-adblock"
 
-[package.metadata.maturin]
-classifier = [
-    "Programming Language :: Python",
-    "Programming Language :: Rust",
-    "License :: OSI Approved :: MIT License",
-    "License :: OSI Approved :: Apache Software License",
-]
-requires-python = ">=3.6"
-
 [profile.release]
 debug = true
 
--- pyproject.toml.orig	2021-06-26 20:50:00 UTC
+++ pyproject.toml
@@ -1,8 +1,18 @@
-[tool.poetry]
+[project]
 name = "adblock"
 version = "0.0.0"
 description = "Brave's adblocking in Python"
-authors = ["Árni Dagur <arni@dagur.eu>"]
+requires-python = ">=3.6"
+authors = [
+    {email = "arni@dagur.eu"},
+    {name = "Árni Dagur"}
+]
+classifiers = [
+    "Programming Language :: Python",
+    "Programming Language :: Rust",
+    "License :: OSI Approved :: MIT License",
+    "License :: OSI Approved :: Apache Software License",
+]
 
 [tool.poetry.dependencies]
 python = "^3.6"
--- tests/test_metadata.py.orig	2021-06-26 20:50:00 UTC
+++ tests/test_metadata.py
@@ -52,10 +52,10 @@ def test_required_python_version():
     Make sure that the Python interpreter we're running this test suite on
     falls into the required Python range.
     """
-    with open("Cargo.toml", encoding="utf-8") as f:
-        cargo_toml = toml.loads(f.read())
+    with open("pyproject.toml", encoding="utf-8") as f:
+        pyproject_toml = toml.loads(f.read())
 
-    required_python = cargo_toml["package"]["metadata"]["maturin"]["requires-python"]
+    required_python = pyproject_toml["project"]["requires-python"]
     assert required_python.startswith(">=")
     required_python = required_python[2:]
     assert get_current_python_version() >= required_python




--- pyproject.toml.orig	2023-11-30 00:16:23 UTC
+++ pyproject.toml
@@ -1,11 +1,21 @@
-[tool.poetry]
+[project]
 name = "adblock"
 version = "0.0.0"
 description = "Brave's adblocking in Python"
-authors = ["Árni Dagur <arni@dagur.eu>"]
+requires-python = ">=3.7"
+authors = [
+    {email = "arni@dagur.eu"},
+    {name = "Árni Dagur"}
+]
+classifiers = [
+    "Programming Language :: Python",
+    "Programming Language :: Rust",
+    "License :: OSI Approved :: MIT License",
+    "License :: OSI Approved :: Apache Software License",
+]

 [tool.poetry.dependencies]
-python = "^3.6"
+python = "^3.7"

 [tool.poetry.dev-dependencies]
 maturin = "*"
@@ -15,3 +25,11 @@ build-backend = "maturin"
 [build-system]
 requires = ["maturin>=0.12,<0.13"]
 build-backend = "maturin"
+
+[package.metadata.maturin]
+classifier = [
+    "Programming Language :: Python",
+    "Programming Language :: Rust",
+    "License :: OSI Approved :: MIT License",
+    "License :: OSI Approved :: Apache Software License",
+]




--- tests/test_metadata.py.orig	2023-11-30 00:16:36 UTC
+++ tests/test_metadata.py
@@ -57,10 +57,10 @@ def test_required_python_version():
     Make sure that the Python interpreter we're running this test suite on
     falls into the required Python range.
     """
-    with open("Cargo.toml", encoding="utf-8") as f:
-        cargo_toml = toml.loads(f.read())
+    with open("pyproject.toml", encoding="utf-8") as f:
+        pyproject_toml = toml.loads(f.read())

-    required_python = cargo_toml["package"]["metadata"]["maturin"]["requires-python"]
+    required_python = pyproject_toml["project"]["requires-python"]
     assert required_python.startswith(">=")
     required_python = required_python[2:]
     assert get_current_python_version() >= parse_version(required_python)

Return to bug 275479

Lines 1-6 Link Here

(-)b/www/py-adblock/Makefile (-60 / +66 lines)
1	PORTNAME= adblock	1	PORTNAME= adblock
2	DISTVERSION= 0.5.0	2	DISTVERSION= 0.6.0
3	PORTREVISION= 51
4	CATEGORIES= www python	3	CATEGORIES= www python
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	4	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
6		5
Lines 31-101 GH_ACCOUNT= ArniDagur Link Here
31	GH_PROJECT= python-adblock	30	GH_PROJECT= python-adblock
32	USE_PYTHON= autoplist concurrent cython distutils	31	USE_PYTHON= autoplist concurrent cython distutils
33		32
34	CARGO_CRATES= adblock-0.3.13 \	33	CARGO_CRATES= adblock-0.5.6 \
35	addr-0.14.0 \	34	addr-0.14.0 \
36	adler-1.0.2 \	35	adler-1.0.2 \
37	aho-corasick-0.7.18 \	36	aho-corasick-0.7.18 \
38	autocfg-1.0.1 \	37	autocfg-1.1.0 \
39	base64-0.13.0 \	38	base64-0.13.0 \
40	bitflags-1.2.1 \	39	bitflags-1.3.2 \
41	byteorder-1.4.3 \	40	byteorder-1.4.3 \
42	cfg-if-1.0.0 \	41	cfg-if-1.0.0 \
43	crc32fast-1.2.1 \	42	crc32fast-1.3.2 \
44	ctor-0.1.20 \	43	either-1.7.0 \
45	either-1.6.1 \	44	flate2-1.0.24 \
46	flate2-1.0.20 \
47	form_urlencoded-1.0.1 \	45	form_urlencoded-1.0.1 \
48	ghost-0.1.2 \	46	idna-0.2.3 \
49	idna-0.2.2 \	47	indoc-1.0.6 \
50	indoc-0.3.6 \	48	itertools-0.10.3 \
51	indoc-impl-0.3.6 \	49	libc-0.2.126 \
52	instant-0.1.9 \	50	lock_api-0.4.7 \
53	inventory-0.1.10 \	51	matches-0.1.9 \
54	inventory-impl-0.1.10 \	52	memchr-2.5.0 \
55	itertools-0.9.0 \	53	miniz_oxide-0.5.3 \
56	libc-0.2.93 \	54	num-traits-0.2.15 \
57	lock_api-0.4.3 \	55	once_cell-1.13.0 \
58	matches-0.1.8 \	56	parking_lot-0.12.1 \
59	memchr-2.4.0 \	57	parking_lot_core-0.9.3 \
60	miniz_oxide-0.4.4 \	58	paste-1.0.7 \
61	num-traits-0.2.14 \
62	once_cell-1.7.2 \
63	parking_lot-0.11.1 \
64	parking_lot_core-0.8.3 \
65	paste-0.1.18 \
66	paste-impl-0.1.18 \
67	percent-encoding-2.1.0 \	59	percent-encoding-2.1.0 \
68	proc-macro-hack-0.5.19 \	60	proc-macro2-1.0.40 \
69	proc-macro2-1.0.26 \	61	psl-2.0.90 \
70	psl-2.0.18 \	62	psl-types-2.0.10 \
71	psl-types-2.0.7 \	63	pyo3-0.16.5 \
72	pyo3-0.13.2 \	64	pyo3-build-config-0.16.5 \
73	pyo3-macros-0.13.2 \	65	pyo3-ffi-0.16.5 \
74	pyo3-macros-backend-0.13.2 \	66	pyo3-macros-0.16.5 \
75	quote-1.0.9 \	67	pyo3-macros-backend-0.16.5 \
76	redox_syscall-0.2.5 \	68	quote-1.0.20 \
77	regex-1.5.4 \	69	redox_syscall-0.2.13 \
78	regex-syntax-0.6.25 \	70	regex-1.6.0 \
79	rmp-0.8.10 \	71	regex-syntax-0.6.27 \
		72	rmp-0.8.11 \
80	rmp-serde-0.13.7 \	73	rmp-serde-0.13.7 \
		74	rmp-serde-0.15.5 \
81	scopeguard-1.1.0 \	75	scopeguard-1.1.0 \
82	seahash-3.0.7 \	76	seahash-3.0.7 \
83	serde-1.0.125 \	77	serde-1.0.139 \
84	serde_derive-1.0.125 \	78	serde_derive-1.0.139 \
85	smallvec-1.6.1 \	79	smallvec-1.9.0 \
86	syn-1.0.69 \	80	syn-1.0.98 \
87	tinyvec-1.2.0 \	81	target-lexicon-0.12.4 \
		82	tinyvec-1.6.0 \
88	tinyvec_macros-0.1.0 \	83	tinyvec_macros-0.1.0 \
89	twoway-0.2.1 \	84	twoway-0.2.2 \
90	unchecked-index-0.2.2 \	85	unchecked-index-0.2.2 \
91	unicode-bidi-0.3.5 \	86	unicode-bidi-0.3.8 \
92	unicode-normalization-0.1.17 \	87	unicode-ident-1.0.2 \
93	unicode-xid-0.2.1 \	88	unicode-normalization-0.1.21 \
94	unindent-0.1.7 \	89	unindent-0.1.9 \
95	url-2.2.1 \	90	url-2.2.2 \
96	winapi-0.3.9 \	91	windows-sys-0.36.1 \
97	winapi-i686-pc-windows-gnu-0.4.0 \	92	windows_aarch64_msvc-0.36.1 \
98	winapi-x86_64-pc-windows-gnu-0.4.0	93	windows_i686_gnu-0.36.1 \
		94	windows_i686_msvc-0.36.1 \
		95	windows_x86_64_gnu-0.36.1 \
		96	windows_x86_64_msvc-0.36.1
99	CARGO_BUILD= no	97	CARGO_BUILD= no
100	CARGO_INSTALL= no	98	CARGO_INSTALL= no
101	CARGO_TARGET_DIR= ${WRKSRC}/target	99	CARGO_TARGET_DIR= ${WRKSRC}/target
Lines 113-132 do-configure: Link Here
113	do-build:	111	do-build:
114	@(cd ${BUILD_WRKSRC} ; \	112	@(cd ${BUILD_WRKSRC} ; \
115	PSL_PATH="${PREFIX}/share/public_suffix_list/public_suffix_list.dat" \	113	PSL_PATH="${PREFIX}/share/public_suffix_list/public_suffix_list.dat" \
116	${SETENV} ${MAKE_ENV} maturin-${PYTHON_VER} build --release ${WITH_DEBUG:D:U--strip})	114	${SETENV} ${MAKE_ENV} maturin-${PYTHON_VER} build --release \
		115	${WITH_DEBUG:D:U--strip})
117		116
118	# Due to upstream not supplying a setup.py file or other way to install	117	# Due to upstream not supplying a setup.py file or other way to install
119	# using pip command for now...	118	# using pip command for now...
120	do-install:	119	do-install:
121	.if ${ARCH:Mpowerpc64*}	120	.if ${ARCH:Mpowerpc64*}
122	@(cd ${INSTALL_WRKSRC}; \	121	@(cd ${INSTALL_WRKSRC}; \
123	${FIND} . -name "whl" -exec sh -c 'mv {} `echo {} \| sed -E -e "s/powerpc./powerpc.whl/"`' \;)	122	${FIND} . -name "whl" -exec ${SH} -c 'mv {} `echo {} \| ${SED} -E -e "s/powerpc./powerpc.whl/"`' \
		123	\;)
124	.endif	124	.endif
125	@(cd ${INSTALL_WRKSRC} ; \	125	@(cd ${INSTALL_WRKSRC} ; \
126	${INSTALL_DATA} "target/release/libadblock.so" \	126	${INSTALL_DATA} "target/release/libadblock.so" \
127	"${STAGEDIR}/${PREFIX}/lib" ; \	127	"${STAGEDIR}/${PREFIX}/lib" ; \
128	${SETENV} ${MAKE_ENV} pip-${PYTHON_VER} install --isolated --root=${STAGEDIR} \	128	${SETENV} ${MAKE_ENV} pip-${PYTHON_VER} install --isolated \
129	--ignore-installed --no-deps target/wheels/*.whl)	129	--root=${STAGEDIR} --ignore-installed --no-deps target/wheels/*.whl)
130		130
131	post-install:	131	post-install:
132	(cd ${STAGEDIR}${PREFIX} && \	132	(cd ${STAGEDIR}${PREFIX} && \
Lines 138-145 post-install: Link Here
138	# contains only the EGG files as a whole.	138	# contains only the EGG files as a whole.
139	# SEE devel/py-maturin/Makefile	139	# SEE devel/py-maturin/Makefile
140	@${FIND} ${STAGEDIR} \	140	@${FIND} ${STAGEDIR} \
141	-type f -o -type l \| \	141	-type \
142	${SORT} \| ${SED} -e 's\|${STAGEDIR}\|\|' > \	142	f \
		143	-o \
		144	-type \
		145	l \| \
		146	${SORT} \| \
		147	${SED} -e 's\|${STAGEDIR}\|\|' \
		148	> \
143	${WRKDIR}/.PLIST.pymodtmp	149	${WRKDIR}/.PLIST.pymodtmp
144		150
145	.include <bsd.port.mk>	151	.include <bsd.port.mk>

Added Link Here

(-)b/www/py-adblock/files/patch-Cargo.toml (+17 lines)
1	--- Cargo.toml.orig 2023-11-30 00:15:19 UTC
2	+++ Cargo.toml
3	@@ -9,15 +9,6 @@ repository = "https://github.com/ArniDagur/python-adbl
4	homepage = "https://github.com/ArniDagur/python-adblock"
5	repository = "https://github.com/ArniDagur/python-adblock"
6
7	-[package.metadata.maturin]
8	-classifier = [
9	- "Programming Language :: Python",
10	- "Programming Language :: Rust",
11	- "License :: OSI Approved :: MIT License",
12	- "License :: OSI Approved :: Apache Software License",
13	-]
14	-requires-python = ">=3.7"
15	-
16	[profile.release]
17	debug = true

Removed Link Here

(-)a/www/py-adblock/files/patch-maturin (-59 lines)
1	Obtained from: https://github.com/ArniDagur/python-adblock/commit/7597cd0b841a0ede22ff4cec6b4b91fb7d26a805
2
3	--- Cargo.toml.orig 2021-06-26 20:50:00 UTC
4	+++ Cargo.toml
5	@@ -9,15 +9,6 @@ readme = "README.md"
6	homepage = "https://github.com/ArniDagur/python-adblock"
7	repository = "https://github.com/ArniDagur/python-adblock"
8
9	-[package.metadata.maturin]
10	-classifier = [
11	- "Programming Language :: Python",
12	- "Programming Language :: Rust",
13	- "License :: OSI Approved :: MIT License",
14	- "License :: OSI Approved :: Apache Software License",
15	-]
16	-requires-python = ">=3.6"
17	-
18	[profile.release]
19	debug = true
20
21	--- pyproject.toml.orig 2021-06-26 20:50:00 UTC
22	+++ pyproject.toml
23	@@ -1,8 +1,18 @@
24	-[tool.poetry]
25	+[project]
26	name = "adblock"
27	version = "0.0.0"
28	description = "Brave's adblocking in Python"
29	-authors = ["Árni Dagur <arni@dagur.eu>"]
30	+requires-python = ">=3.6"
31	+authors = [
32	+ {email = "arni@dagur.eu"},
33	+ {name = "Árni Dagur"}
34	+]
35	+classifiers = [
36	+ "Programming Language :: Python",
37	+ "Programming Language :: Rust",
38	+ "License :: OSI Approved :: MIT License",
39	+ "License :: OSI Approved :: Apache Software License",
40	+]
41
42	[tool.poetry.dependencies]
43	python = "^3.6"
44	--- tests/test_metadata.py.orig 2021-06-26 20:50:00 UTC
45	+++ tests/test_metadata.py
46	@@ -52,10 +52,10 @@ def test_required_python_version():
47	Make sure that the Python interpreter we're running this test suite on
48	falls into the required Python range.
49	"""
50	- with open("Cargo.toml", encoding="utf-8") as f:
51	- cargo_toml = toml.loads(f.read())
52	+ with open("pyproject.toml", encoding="utf-8") as f:
53	+ pyproject_toml = toml.loads(f.read())
54
55	- required_python = cargo_toml["package"]["metadata"]["maturin"]["requires-python"]
56	+ required_python = pyproject_toml["project"]["requires-python"]
57	assert required_python.startswith(">=")
58	required_python = required_python[2:]
59	assert get_current_python_version() >= required_python

Added Link Here

(-)b/www/py-adblock/files/patch-pyproject.toml (+39 lines)
1	--- pyproject.toml.orig 2023-11-30 00:16:23 UTC
2	+++ pyproject.toml
3	@@ -1,11 +1,21 @@
4	-[tool.poetry]
5	+[project]
6	name = "adblock"
7	version = "0.0.0"
8	description = "Brave's adblocking in Python"
9	-authors = ["Árni Dagur <arni@dagur.eu>"]
10	+requires-python = ">=3.7"
11	+authors = [
12	+ {email = "arni@dagur.eu"},
13	+ {name = "Árni Dagur"}
14	+]
15	+classifiers = [
16	+ "Programming Language :: Python",
17	+ "Programming Language :: Rust",
18	+ "License :: OSI Approved :: MIT License",
19	+ "License :: OSI Approved :: Apache Software License",
20	+]
21
22	[tool.poetry.dependencies]
23	-python = "^3.6"
24	+python = "^3.7"
25
26	[tool.poetry.dev-dependencies]
27	maturin = "*"
28	@@ -15,3 +25,11 @@ build-backend = "maturin"
29	[build-system]
30	requires = ["maturin>=0.12,<0.13"]
31	build-backend = "maturin"
32	+
33	+[package.metadata.maturin]
34	+classifier = [
35	+ "Programming Language :: Python",
36	+ "Programming Language :: Rust",
37	+ "License :: OSI Approved :: MIT License",
38	+ "License :: OSI Approved :: Apache Software License",
39	+]

Added Link Here

(-)b/www/py-adblock/files/patch-tests_test__metadata.py (+16 lines)
1	--- tests/test_metadata.py.orig 2023-11-30 00:16:36 UTC
2	+++ tests/test_metadata.py
3	@@ -57,10 +57,10 @@ def test_required_python_version():
4	Make sure that the Python interpreter we're running this test suite on
5	falls into the required Python range.
6	"""
7	- with open("Cargo.toml", encoding="utf-8") as f:
8	- cargo_toml = toml.loads(f.read())
9	+ with open("pyproject.toml", encoding="utf-8") as f:
10	+ pyproject_toml = toml.loads(f.read())
11
12	- required_python = cargo_toml["package"]["metadata"]["maturin"]["requires-python"]
13	+ required_python = pyproject_toml["project"]["requires-python"]
14	assert required_python.startswith(">=")
15	required_python = required_python[2:]
16	assert get_current_python_version() >= parse_version(required_python)