gentoo resync : 05.12.2021

5 files changed, 94 insertions, 88 deletions

diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 43d564bfb468..2e194a6af58d 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,7 +1,8 @@
 AUX aws-2020-gentoo.patch 450 BLAKE2B db6858688b2a9237efea0bf82f39d62855a0d126f3be7174981700bf4964e053c0715cd2e5f9f0cc98c5a884a89af47b7f83e6a7ce89d491073bf4c2370ee91f SHA512 80862c07fec63999ff531981c843e463888bb2f78310e28fa9ade6814553cb3cadad548d896a643a819bd5904b7056486ff372ad101c6919919fcc6895f14d02
-DIST aws-2020-20200429-19A9F-src.tar.gz 4120886 BLAKE2B 44156b532dd4382995e5b33eedbb39b4d4fa542f57f3a7d596875a25c1eb59c3e4cc0085cfc60f385566842f2b047086a66a966dc3b9dcd8f48ae7da0c07c01e SHA512 284331bcd07955737ebc6b95a0a72984ace55a1911f1ed809b0ba8e525b03df57a668ccd92d0edfde42be2e06c09a3225e84f5d0501a488a004eb3eeaa746a61
+AUX aws-22.0.0-gentoo.patch 1120 BLAKE2B 4cb809bd0c1771bbd15ab1e70ebb7c0f8d523c6f167f5e72906abef73c492889ce75de7d40d781f9e69b97a82eccebe5cb3bb2df40c387a7b5321c4dcbb0ed03 SHA512 a272aa69d2d19b2cf79f2eb42e81a0659dfad1cf94b5d44c032243c30774fa8f428eb8512c9b8667297429d50c00bd1484c360cded113c10957b53f42b85611a
 DIST aws-2021-20210518-19F65-src.tar.gz 4351625 BLAKE2B 227e1af5423c7cbf8b15b2ad37b5fbea862daca10dd12e79edb6cb1392f502b8b665d0cedc151a4190723c6aa795801b65c5807592d0292511a9a80318f0a722 SHA512 1820750daf2ba2e95479a8280aa0eae0d38e1d86a32570b4caaa845498ad8f0e8ac8c91f6aef0d5ef06fa1b33bc2b2b264cacb7101ca69fc81f36ab8cb17c65f
-EBUILD aws-2020-r1.ebuild 949 BLAKE2B 4e1c7cb3283d45871e84b3eb13d92e2dcf1a20ae3bf49c69fe1e028fa9f570e18e62238f62070c685695b5ef2ce1113caf3b66e8dec1a3a3cea0e03a04c07b64 SHA512 c72b085268de15d8373f1bb270f9171e483056532f90e79d1ae259943baa0354f37a6f31ee4fa11c8dc950cae830c689205451cc7990a4ead4a7176e78b2253c
-EBUILD aws-2020.ebuild 900 BLAKE2B 4e8e25a6008bab2738c23883c55680c99e068604f00f6f1900bb03e410295c6a591fc8ddc728d19f376c2539f0d6f31bce4bcb438c3b349b9b50bccdf55f18d9 SHA512 125aa34b8f5046cdd56e7111dbd2a53bd39b46ee2e6ead82fdbf04d0e62d1d62d570494fc6fb803e8f8864b443f8c1ea8b14b356be2b8e518b1aa1951ec8db60
+DIST aws-22.0.0.tar.gz 2356886 BLAKE2B 3f0a36ce23ed50855dddeb8ecc1888d51c4c7368990124c3d55f240c8b07cc72b59b4c172cad05d282de0ff4cd348ff912315d8cfad1582b2bbb049ad5fcea12 SHA512 6baeff7fa8012cb155bd3964177368f4ccd0bb367abaa66d44c0ffbcd4145f3930fe2e0fe5cfbeb41adccb7395d46c49acffc502878e9b83ecb5e2de597b897b
+DIST templates-parser-22.0.0.tar.gz 224473 BLAKE2B c0c0d6feada3d0e54ee0456b48979e1f436c2bdf7210aeb061640c3128294b243ac21c29ef538b055871315b567640e37782b28057954bf4d43473d372c7d983 SHA512 9ce512e41bf3e682f1671d3ed931830d2279da9bef58f9997e430f4852cebb6119cabf0fde7dfaf999586155c13472ab258a0e0f3d885522aeb86d8acb4a2d4f
 EBUILD aws-2021.ebuild 944 BLAKE2B 9380715d4fd6011d36f87675cc1a5ad9ffc4eeae9218636068c35e7f74cd1aa33830e9eac4b8cca8c9eeb76f2dceb2bb2c6a7cc9ce3b0712253f4fb6c2fed967 SHA512 97dc2eebf62c2c25ed1ded30eb536f152199192aed8dcba8939de8c747b62ae1ede6ca3380b3bedebe399ffb7473b469674464cd6ee9d252391600dc16df746f
+EBUILD aws-22.0.0.ebuild 1308 BLAKE2B 42063749241f3c6d53abb70ccb56cedee454d62725fad8e552f413775832274de42d90f59c4afb6687314d336b589a9b9f958025bf9037615205e2fb408ded24 SHA512 1d663bbb6ff420f4b63dccedb58bdd8dbd5cfc12af04306097f5e2af0af1eae7088f765dbb54e8d676ed13bf076296ed5e90d4b253a2b7c146fd1e4a81628b76
 MISC metadata.xml 660 BLAKE2B 0b78458e2f5278c613f8af931d3b6e3f14475444eff8337c9b64fef5bd3d3bf62ac1feea01c29013fdeecbf3d5a24c709522d4dbee55f3613542bd91dc9e2e67 SHA512 3c8c25d7cb779b766d0be613563eaa57463e574f41d0accf912f05ebc9e6e29b28062b1505af007c898ac2e329913762dfe2c718cd8f811c850e447cb122dc9d
diff --git a/dev-ada/aws/aws-2020-r1.ebuild b/dev-ada/aws/aws-2020-r1.ebuild
deleted file mode 100644
index a831ab9427ea..000000000000
--- a/dev-ada/aws/aws-2020-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2019 gnat_202{0..1} )
-inherit ada multiprocessing
-
-MYP=${P}-${PV}0429-19A9F-src
-ADAMIRROR=https://community.download.adacore.com/v1
-ID=c1b0f6863d1a30acaee1df022a65ad11d5737a84
-
-DESCRIPTION="A complete Web development framework"
-HOMEPAGE="http://libre.adacore.com/tools/aws/"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-ada/xmlada[${ADA_USEDEP},shared,static-libs]"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_configure() {
-	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_compile() {
-	emake \
-		PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
diff --git a/dev-ada/aws/aws-2020.ebuild b/dev-ada/aws/aws-2020.ebuild
deleted file mode 100644
index c566cbadf06d..000000000000
--- a/dev-ada/aws/aws-2020.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2019 )
-inherit ada multiprocessing
-
-MYP=${P}-20200429-19A9F-src
-
-DESCRIPTION="A complete Web development framework"
-HOMEPAGE="http://libre.adacore.com/tools/aws/"
-SRC_URI="https://community.download.adacore.com/v1/c1b0f6863d1a30acaee1df022a65ad11d5737a84?filename=${MYP}.tar.gz
-	-> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-ada/xmlada[${ADA_USEDEP},shared,static-libs]"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_configure() {
-	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_compile() {
-	emake \
-		PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
diff --git a/dev-ada/aws/aws-22.0.0.ebuild b/dev-ada/aws/aws-22.0.0.ebuild
new file mode 100644
index 000000000000..2ad9894c2821
--- /dev/null
+++ b/dev-ada/aws/aws-22.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_202{0..1} )
+inherit ada multiprocessing
+
+DESCRIPTION="A complete Web development framework"
+HOMEPAGE="http://libre.adacore.com/tools/aws/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz
+	https://github.com/AdaCore/templates-parser/archive/refs/tags/v${PV}.tar.gz
+	-> templates-parser-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared,static-libs]
+	dev-libs/openssl"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020-gentoo.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	rmdir templates_parser || die
+	mv ../templates-parser-${PV} templates_parser || die
+}
+
+src_configure() {
+	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
+		ZLIB=true SOCKET=openssl \
+		GPRBUILD="/usr/bin/gprbuild -v"
+}
+
+src_compile() {
+	emake \
+		PROCESSORS=$(makeopts_jobs) ENABLE_SHARED=true \
+		GPRBUILD="/usr/bin/gprbuild -v"
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PROCESSORS=$(makeopts_jobs) ENABLE_SHARED=true \
+		GPRINSTALL="/usr/bin/gprinstall -v"
+	einstalldocs
+}
diff --git a/dev-ada/aws/files/aws-22.0.0-gentoo.patch b/dev-ada/aws/files/aws-22.0.0-gentoo.patch
new file mode 100644
index 000000000000..868345504240
--- /dev/null
+++ b/dev-ada/aws/files/aws-22.0.0-gentoo.patch
@@ -0,0 +1,33 @@
+--- a/Makefile	2021-11-18 21:58:13.144841987 +0100
++++ b/Makefile	2021-11-18 21:59:15.974876738 +0100
+@@ -185,10 +185,9 @@
+ #  build
+ 
+ build-tools-native:
+-	$(GPRBUILD) -p $(GPROPTS) $(GPR_STATIC) tools/tools.gpr
++	$(GPRBUILD) -p $(GPROPTS) $(GPR_SHARED) tools/tools.gpr
+ 
+ build-lib-native:
+-	$(GPRBUILD) -p $(GPROPTS) aws.gpr
+ ifeq (${ENABLE_SHARED}, true)
+ 	$(GPRBUILD) -p $(GPROPTS) $(GPR_SHARED) aws.gpr
+ endif
+@@ -259,15 +258,15 @@
+ 	--build-var=LIBRARY_TYPE --build-var=AWS_BUILD
+ 
+ install-lib-native:
+-	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) $(GPR_DEFAULT) \
+-		--build-name=$(DEFAULT_LIBRARY_TYPE) aws.gpr
+ ifeq (${ENABLE_SHARED}, true)
+ 	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) \
+ 		$(GPR_OTHER) --build-name=$(OTHER_LIBRARY_TYPE) aws.gpr
++	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) \
++		$(GPR_OTHER) --build-name=$(OTHER_LIBRARY_TYPE) ssl/ssl.gpr
+ endif
+ 
+ install-tools-native:
+-	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) $(GPR_STATIC) --mode=usage \
++	$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) $(GPR_SHARED) --mode=usage \
+ 		--build-name=$(DEFAULT_LIBRARY_TYPE) \
+ 		--install-name=aws tools/tools.gpr
+