gentoo resync : 29.12.2022

4 files changed, 80 insertions, 79 deletions

diff --git a/media-libs/libfreehand/Manifest b/media-libs/libfreehand/Manifest
index 7e35a4f03c09..c34797ba9091 100644
--- a/media-libs/libfreehand/Manifest
+++ b/media-libs/libfreehand/Manifest
@@ -1,5 +1,5 @@
 AUX libfreehand-0.1.2-icu-65.patch 993 BLAKE2B 80699fd1393f3234b2041eb0c15fe53cbb3fec9c0911b21fc4a4b9834be5dba781b68ea506c18ed34982f588b243c6df0757bdd720f71bb9927b2fda8a6211fa SHA512 ff271f6132417940c1269a4df76c956960014e44b15284f5b03e90ed2668517fdd864cd281ceda1d7cc02df46c194c9cefcfd52e71fd7ae6398a81684b976d71
 DIST libfreehand-0.1.2.tar.xz 516132 BLAKE2B 7c2dc629fd2a84f23dcd721ed6f9d4644e3bf7a160be9ca5ec0f15a72ae63b3cf861f80fafa12ef1f99b02e0fbc1c806bc37c466010a420bb425f4f9e2757928 SHA512 4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963
-EBUILD libfreehand-0.1.2.ebuild 1267 BLAKE2B 54255b1f6113d69fce5682e010a1f8f3beb0f5d423436877e75dd51e14c9d0df22be2d402b4b73f6f91fa3c3ef54f33afd77fc060419a8683eaff9130e63be2c SHA512 b76e4f4f29a2e377a31676eeb24066efb35a2dba32e57ce5f6e898d05b85bb01168f80ef723339bc4edfc13f004fae61f81bdb2b2c5829ea58bb02d661e8af89
-EBUILD libfreehand-9999.ebuild 1246 BLAKE2B 767d2896865fd15b611bc8fdeb7d18992ca93d357cee5c2d326819349e450edfda10e48f863a69a62e15debbf45e1b4806a51e5b85e38273b24d34e806c19046 SHA512 1a37677a4de0caa0d04876d8a46bed67a9a62318526bde2eb2623664583a27816d069a16e1ab2eeab5ccb27265020c91d53028392254283a4735e734030c6314
+EBUILD libfreehand-0.1.2-r1.ebuild 1191 BLAKE2B 397762be37ac503f04add0fe7ccd9d38382820f5e8c21e810ebf65549824567be62ac2b48830787ccfaad7fb598e147823a30879a8ddd1086e1e1f76d01442b6 SHA512 dcc5659589bf7662cbecbb88680cc750cbac9db2487855e59b0364e7d87fb73d281716b8b2357e4ef8d6ae40250c23a9b4fb694b9bb9a5c52aece4213db2abea
+EBUILD libfreehand-9999.ebuild 1151 BLAKE2B bce0ebe18ea5602b7ac63d30e4586e1b057b60b8a0928002de8afc9fbd569a8974883de264847804501199272dab97e2144fd8c04e27fbb470c0facb3c9f70ef SHA512 1212801a436a3b03ce9cc39f79ac2477a21902a8a04754f227b4a918d8eeedcbc272cb0767a8b78d5c1e497fe192c3d6a34efa3cc4c93930203497716512963d
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/media-libs/libfreehand/libfreehand-0.1.2-r1.ebuild b/media-libs/libfreehand/libfreehand-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..c1338ae71215
--- /dev/null
+++ b/media-libs/libfreehand/libfreehand-0.1.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libfreehand.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://dev-www.libreoffice.org/src/libfreehand/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+fi
+
+DESCRIPTION="Library for import of FreeHand drawings"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/librevenge
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-libs/icu
+	dev-util/gperf
+	media-libs/lcms
+	sys-devel/libtool
+	test? ( dev-util/cppunit )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-icu-65.patch )
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == *9999 ]]; then
+		mkdir -p m4 || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable test tests)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/libfreehand/libfreehand-0.1.2.ebuild b/media-libs/libfreehand/libfreehand-0.1.2.ebuild
deleted file mode 100644
index 582c605fe52b..000000000000
--- a/media-libs/libfreehand/libfreehand-0.1.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libfreehand.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="Library for import of FreeHand drawings"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libfreehand/${P}.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/librevenge
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-libs/icu
-	dev-util/gperf
-	media-libs/lcms
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=( "${FILESDIR}/${P}-icu-65.patch" )
-
-src_prepare() {
-	default
-	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# bug 619762
-	append-cxxflags -std=c++14
-
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libfreehand/libfreehand-9999.ebuild b/media-libs/libfreehand/libfreehand-9999.ebuild
index 37f65017def8..b5b9ce6d48a9 100644
--- a/media-libs/libfreehand/libfreehand-9999.ebuild
+++ b/media-libs/libfreehand/libfreehand-9999.ebuild
@@ -1,29 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic
-
-if [[ ${PV} = *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libfreehand.git"
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libfreehand/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
+
 DESCRIPTION="Library for import of FreeHand drawings"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-IUSE="doc static-libs test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
 RDEPEND="
 	dev-libs/librevenge
 	sys-libs/zlib
@@ -36,21 +31,24 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 	test? ( dev-util/cppunit )
 "
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
 
 src_prepare() {
 	default
-	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == *9999 ]] && eautoreconf
+
+	if [[ ${PV} == *9999 ]]; then
+		mkdir -p m4 || die
+		eautoreconf
+	fi
 }
 
 src_configure() {
-	# bug 619762
-	append-cxxflags -std=c++14
-
 	local myeconfargs=(
 		--disable-werror
 		$(use_with doc docs)
-		$(use_enable static-libs static)
 		$(use_enable test tests)
 	)
 	econf "${myeconfargs[@]}"
@@ -58,5 +56,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }