gentoo resync : 09.07.2022

3 files changed, 61 insertions, 14 deletions

diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
index f8ff6b5fd018..3bfb0106d074 100644
--- a/app-text/xournalpp/Manifest
+++ b/app-text/xournalpp/Manifest
@@ -5,6 +5,7 @@ DIST xournalpp-1.0.20.tgz 14895705 BLAKE2B f1a4721f4f0b2f0e666c7466d7ddbd1f29917
 DIST xournalpp-1.1.1.tgz 15093900 BLAKE2B 87988bc78a0d904f1e3533e393bcdfc7b76517f6cc13343cb63ceaa83de25eca885274238ce45840334ea653964c9cd1834fc22d5b2c89a731ae5616f01f22c8 SHA512 efba97d26f624e3a1b8164ef6333a0f1d2992d0245414bdb51692d845965f6c37071f687520b43a94f713465796a16cbafd8929fd3bf8e6c3face847df92251d
 EBUILD xournalpp-1.0.20.ebuild 919 BLAKE2B 7528a7ca321f0d96b1e6bf3577457aa71e079599674064dc0e9be296a39736399daeb03fce279f965f25366921245a386ff374fb52236a05a5bbea0c6d8476ed SHA512 93e304cfa2d0e63523eda840b7e65572bf7ec1263cbf02d60c8a5dbc91b6efd587f53921cba2705d138150480cebd53317efe0968f36046ab351d8223532a9d4
 EBUILD xournalpp-1.1.1-r1.ebuild 1019 BLAKE2B cfb457309d08b611980b8e0d8d995f4274b48126c64fee196296b7a89983149f5b76500aba2fd0c10e61b7db57257d8684b5d93b3476791ad70ec47af907280e SHA512 5c31277a74affc8d22e7bbf51e9ea78b53d51b01126bc95ea5210bfdeffa60a2cd7882911a6a00a0e8b225a26d79c9ad53e52055736981eae4c45f0dfe9326c1
+EBUILD xournalpp-1.1.1-r2.ebuild 1109 BLAKE2B a7b31fd94be15af38987b78efaacdfa6d19dbc3b7e4a73c07984cbf2b197d11d13439b29a940949695ed825cdb828313e7f06ca01eda780e55626f3e4299bca4 SHA512 3d8df719fc29e5acd86b82d8c79956ec147cfca1ff7051b9a0eb8f9543be00f800c834dac02f8e881e1be39f9b9c3e9451a05a657421ce177f0a804f90fc3a71
 EBUILD xournalpp-1.1.1.ebuild 883 BLAKE2B 359cb7146ce2b94f0bfc8a836c589b0d7212cfcc2e76bb4c5c7aa476652494c0c0541718ca2c72e1b877db971ec66e7ad9731218a9472736726cc4f77dc3eff8 SHA512 41f852b1c631f229e3e9e9de8b80233eb4b0c9dc1a06eff9e2afdf761b5640f7fb788259815a29864077c256642dff5228a45ff2b68bb47a987c457fc2b24610
-EBUILD xournalpp-9999.ebuild 1020 BLAKE2B fcf320ceb2c2f98ea1f67733e35dd635fad716ef82ef51d6d7ef6be2918207c4f5c669f0bc6996aafdac83cedab2f398968402afe9f30c8b7ca4dd1e3a54e36b SHA512 fb359216608c29ab46fedf91bb1a6b9ccec6f91a1fc53da5e809508c76993e87d524cc8167faa7b8271fc1935af898bbe31655dba5fe29bcc668e7c479855058
+EBUILD xournalpp-9999.ebuild 1109 BLAKE2B a7b31fd94be15af38987b78efaacdfa6d19dbc3b7e4a73c07984cbf2b197d11d13439b29a940949695ed825cdb828313e7f06ca01eda780e55626f3e4299bca4 SHA512 3d8df719fc29e5acd86b82d8c79956ec147cfca1ff7051b9a0eb8f9543be00f800c834dac02f8e881e1be39f9b9c3e9451a05a657421ce177f0a804f90fc3a71
 MISC metadata.xml 221 BLAKE2B 4b8e1435358aa300f6debd1760de3509ae9e0ae2678b4d55057c3940efa9b15d62881ac988725e58cce5d2cf63d1de6791cb0b98aa797eecbcdd29c85d8a682f SHA512 40bf10d939c1f6ba4a0594cff7f4a44c16660489226a9a23a6e9327a43dbf757b42a8be0bc8d82daa8818b90c1b4f8c3d093a6b9f36ca15dc36301cda2a308dc
diff --git a/app-text/xournalpp/xournalpp-1.1.1-r2.ebuild b/app-text/xournalpp/xournalpp-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..a1105db47c04
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-1.1.1-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Upstream only support 5.3 (see CMakeLists.txt), also bug #854615
+LUA_COMPAT=( lua5-3 )
+inherit cmake lua-single xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
+else
+	SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
+	KEYWORDS="~amd64 ~ppc64"
+fi
+
+DESCRIPTION="Handwriting notetaking software with PDF annotation support"
+HOMEPAGE="https://github.com/xournalpp/xournalpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${LUA_DEPS}
+	app-text/poppler[cairo]
+	dev-libs/glib
+	dev-libs/libxml2
+	dev-libs/libzip:=
+	gnome-base/librsvg
+	media-libs/portaudio[cxx]
+	media-libs/libsndfile
+	sys-libs/zlib:=
+	x11-libs/gtk+:3
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	sys-apps/lsb-release
+	elibc_musl? ( sys-libs/libbacktrace )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.1-nostrip.patch"
+	"${FILESDIR}/${PN}-1.1.1-nocompress.patch"
+)
diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild
index 761bc8769f66..a1105db47c04 100644
--- a/app-text/xournalpp/xournalpp-9999.ebuild
+++ b/app-text/xournalpp/xournalpp-9999.ebuild
@@ -3,15 +3,16 @@
 
 EAPI=8
 
-inherit cmake xdg
+# Upstream only support 5.3 (see CMakeLists.txt), also bug #854615
+LUA_COMPAT=( lua5-3 )
+inherit cmake lua-single xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
-	unset SRC_URI
 else
-	KEYWORDS="~amd64 ~ppc64"
 	SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
+	KEYWORDS="~amd64 ~ppc64"
 fi
 
 DESCRIPTION="Handwriting notetaking software with PDF annotation support"
@@ -19,9 +20,11 @@ HOMEPAGE="https://github.com/xournalpp/xournalpp"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
-COMMONDEPEND="
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${LUA_DEPS}
 	app-text/poppler[cairo]
 	dev-libs/glib
 	dev-libs/libxml2
@@ -32,10 +35,8 @@ COMMONDEPEND="
 	sys-libs/zlib:=
 	x11-libs/gtk+:3
 "
-RDEPEND="${COMMONDEPEND}
-"
-DEPEND="${COMMONDEPEND}
-"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	sys-apps/lsb-release
@@ -46,7 +47,3 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.1.1-nostrip.patch"
 	"${FILESDIR}/${PN}-1.1.1-nocompress.patch"
 )
-
-src_prepare() {
-	cmake_src_prepare
-}