gentoo resync : 29.12.2022

3 files changed, 30 insertions, 26 deletions

diff --git a/media-libs/libpagemaker/Manifest b/media-libs/libpagemaker/Manifest
index 179ded3bf314..efd469f5d45a 100644
--- a/media-libs/libpagemaker/Manifest
+++ b/media-libs/libpagemaker/Manifest
@@ -1,4 +1,4 @@
 DIST libpagemaker-0.0.4.tar.xz 306496 BLAKE2B 9928d5759c35359c4983724477e432b6876fa4d6e3039296a880661a4587de612ce93908a93d1d2dfbd033c6478748a4329a1682e327db528ddb7dc0947374ef SHA512 d9d9436622ae378da2a3c8e50a35b6133582a595c9ff0fe0e3b124fd0b83f1f12afdfc6a27d16b509ca9bab33067215d7300e505d4bf6b280be7e4bf46da6c64
-EBUILD libpagemaker-0.0.4.ebuild 976 BLAKE2B dc9d68285c38b74e18660d13c15d1b21fbe2ad589da7e922989fad55efbbd9d8881893bf1eb4a5b681ceb34b6fbd293f4275ca0328a214c337cde47cdb0e2484 SHA512 8934f5d7108ae62aa5d3b4731e56fc4e1c145c8d21b2646343d4d2fc2708b255cde745ea3a3d542fb4f1e83152da3b402d289d2836d4867b1b6aba30d7ba809b
-EBUILD libpagemaker-9999.ebuild 1001 BLAKE2B 2c4e1f8276ad064fbd5bd0b770afdec36f35d6d7051bb8b6358bd2b1ab2af18f2c8c8e4140a063a84dc3d3bad35654921625ce5ca73aee348f3d75a9467e486b SHA512 9782f27c4d09ec8e5b52ba53ccfa87b338d6e506bc8c7b183ca80acfc824be49a7ec29a5e0eda4a3cf72a8efe938a715c9dcbafe192aed006284ceca71de8a09
+EBUILD libpagemaker-0.0.4-r1.ebuild 1007 BLAKE2B bee4ae78e190e3400e314122154c91bc01fa63352037aa35cc283dbdb3fb33c0bafb00fda064853913be1250c086a44a106bd363125fe5a05adb27b13b85f1fa SHA512 b909596f464c64e440dc0e67c5e309499eb5c43f422316172ce8decfbcae5c803c19807584f5ed43add551929ffbf825afe162af1d6e9814405366ced2f94a74
+EBUILD libpagemaker-9999.ebuild 1012 BLAKE2B 8fb3666be78bdfd85a3140d965de4625c7114a676b12829acfac177bfb03f8f5925ccb87dacffcda974bf05b9114587e971fe6ddf1ff91f35a69e01b01f28a1f SHA512 83173cd1ae052b98c5da5fcb0a3af7791a05c79de6bde4911aa5d5b9f10cbaa5df873147bca4cf5dee733d9ac76b2855b903e9bd2aeb199a5b158923963d157f
 MISC metadata.xml 347 BLAKE2B 0ba06c106d1090491acd5f81427e86d8a010434ed1458ec439cbcf8981e18fdfababed76375e9abf718f7e2bb039608053f2241c0067fc3b3e0e35b3fb033ead SHA512 135293255acf6c39d9584ceea1761f85be3e9470761b538320f47243479766c690bb87a41ac1be7fd0a3bb69ebdd535236014447db0e087fed44529f575ef2e8
diff --git a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild b/media-libs/libpagemaker/libpagemaker-0.0.4-r1.ebuild
index cd985418d5e9..56a3258992fd 100644
--- a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-0.0.4-r1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-EGIT_REPO_URI="git://gerrit.libreoffice.org/${PN}.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
+EAPI=8
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://git.libreoffice.org/libpagemaker"
+	inherit autotools git-r3
+else
+	SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+fi
 DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
 RDEPEND="
@@ -22,23 +22,27 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
+"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
 
 src_prepare() {
 	default
-	[[ ${PV} == 9999 ]] && eautoreconf
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
 		$(use_enable tools)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/media-libs/libpagemaker/libpagemaker-9999.ebuild b/media-libs/libpagemaker/libpagemaker-9999.ebuild
index 7e312caadfe0..b40a7586cec4 100644
--- a/media-libs/libpagemaker/libpagemaker-9999.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="git://gerrit.libreoffice.org/${PN}.git"
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://git.libreoffice.org/libpagemaker"
 	inherit autotools git-r3
 else
 	SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
@@ -17,16 +17,16 @@ LICENSE="MPL-2.0"
 SLOT="0"
 IUSE="debug doc tools"
 
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
 RDEPEND="
 	dev-libs/librevenge
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
 "
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
 
 src_prepare() {
 	default
@@ -44,5 +44,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }