gentoo resync : 20.03.2022

6 files changed, 199 insertions, 5 deletions

diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
index d0d6951fb4d3..402506bb9d93 100644
--- a/app-text/xournalpp/Manifest
+++ b/app-text/xournalpp/Manifest
@@ -1,5 +1,10 @@
 AUX xournalpp-1.0.18-nostrip.patch 498 BLAKE2B 451eff71c86eff703d7b9dbee910c8938e10fe963d416c10fc0a5da04071672a26313d7c6fd887e960df3dc9b717a74d7b3974020ea6dfafefe2f06ec539cd6e SHA512 b883ba8094f46462c8415df10154fcbe2e773df981bc31fae5695a7d34de97bb984aa7b912cab3c9dcb121f10d52796c766f295d1d6a6ff424fa4d99a9f04e2e
+AUX xournalpp-1.1.1-nocompress.patch 2302 BLAKE2B 1f381d9cc89725aa2ab04c71ceb65c8bf3fad11979c4c689570c9153a9eff456644a38ddee89468f1de976c6e1d837ef46fbb88a771f7eabb1edfa784c51b7ff SHA512 f5222e7764fbbbf8fa20ee8b32609e3d001537c0ac6ef80ab44a8346f6b5545d1339577f4c4001b3516504d9dce45cf441317881a8ede8e331ede7060c197e48
+AUX xournalpp-1.1.1-nostrip.patch 1037 BLAKE2B 5016e48f6abd9368ae703f693efe3ae84d395c939f08e9244443c6aaee794729abbc52195816c7e21f08c751b8c953fef3ffda1c0f0ea73a0203f243f614e81d SHA512 5651db0248ad71967412d33cc2f39b8638c38c185635936e988ef7561dd7a51ebb0c7be803a69b7b4eb4cc548dfd237f2920b2b8c8dd779a38b90b4b28e322e1
 DIST xournalpp-1.0.20.tgz 14895705 BLAKE2B f1a4721f4f0b2f0e666c7466d7ddbd1f299172576d5f86b4ab8150d3bf05231cc7bb40e750394d892fe8ce32b6106e29456e3e9fa976b1bf07a808bf1bfff953 SHA512 c73783d5e40262b2c6f7f6be372839c73a19ab25fc258a7524660654526a3a35a6ba16ba282f793e7982ff97d006703c103fdd579fc16a3e636bf6daf94fe346
+DIST xournalpp-1.1.1.tgz 15093900 BLAKE2B 87988bc78a0d904f1e3533e393bcdfc7b76517f6cc13343cb63ceaa83de25eca885274238ce45840334ea653964c9cd1834fc22d5b2c89a731ae5616f01f22c8 SHA512 efba97d26f624e3a1b8164ef6333a0f1d2992d0245414bdb51692d845965f6c37071f687520b43a94f713465796a16cbafd8929fd3bf8e6c3face847df92251d
 EBUILD xournalpp-1.0.20.ebuild 919 BLAKE2B 7528a7ca321f0d96b1e6bf3577457aa71e079599674064dc0e9be296a39736399daeb03fce279f965f25366921245a386ff374fb52236a05a5bbea0c6d8476ed SHA512 93e304cfa2d0e63523eda840b7e65572bf7ec1263cbf02d60c8a5dbc91b6efd587f53921cba2705d138150480cebd53317efe0968f36046ab351d8223532a9d4
-EBUILD xournalpp-9999.ebuild 845 BLAKE2B 054a68301b4d46cf6dd3a7a768d113b1782775612a768181fb4c384e2ba16b6e1f21abbacf05bb3b7a6396d026164cd462273a7f05b3d24d4a5cab310229e54f SHA512 a2a7f9a71aeea60780b89cc0cf3a0ef0a62c3de72c6fa0f9a3863a4245069975ae230a14aac59940bcad919edb031d686bf0c7a3f2da444fc836eb911e510d26
+EBUILD xournalpp-1.1.1-r1.ebuild 1020 BLAKE2B fcf320ceb2c2f98ea1f67733e35dd635fad716ef82ef51d6d7ef6be2918207c4f5c669f0bc6996aafdac83cedab2f398968402afe9f30c8b7ca4dd1e3a54e36b SHA512 fb359216608c29ab46fedf91bb1a6b9ccec6f91a1fc53da5e809508c76993e87d524cc8167faa7b8271fc1935af898bbe31655dba5fe29bcc668e7c479855058
+EBUILD xournalpp-1.1.1.ebuild 883 BLAKE2B 359cb7146ce2b94f0bfc8a836c589b0d7212cfcc2e76bb4c5c7aa476652494c0c0541718ca2c72e1b877db971ec66e7ad9731218a9472736726cc4f77dc3eff8 SHA512 41f852b1c631f229e3e9e9de8b80233eb4b0c9dc1a06eff9e2afdf761b5640f7fb788259815a29864077c256642dff5228a45ff2b68bb47a987c457fc2b24610
+EBUILD xournalpp-9999.ebuild 1020 BLAKE2B fcf320ceb2c2f98ea1f67733e35dd635fad716ef82ef51d6d7ef6be2918207c4f5c669f0bc6996aafdac83cedab2f398968402afe9f30c8b7ca4dd1e3a54e36b SHA512 fb359216608c29ab46fedf91bb1a6b9ccec6f91a1fc53da5e809508c76993e87d524cc8167faa7b8271fc1935af898bbe31655dba5fe29bcc668e7c479855058
 MISC metadata.xml 221 BLAKE2B 4b8e1435358aa300f6debd1760de3509ae9e0ae2678b4d55057c3940efa9b15d62881ac988725e58cce5d2cf63d1de6791cb0b98aa797eecbcdd29c85d8a682f SHA512 40bf10d939c1f6ba4a0594cff7f4a44c16660489226a9a23a6e9327a43dbf757b42a8be0bc8d82daa8818b90c1b4f8c3d093a6b9f36ca15dc36301cda2a308dc
diff --git a/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch b/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch
new file mode 100644
index 000000000000..dc3ecca1bad0
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch
@@ -0,0 +1,53 @@
+From 91319980ebddf80f797118fd67bf95b509b31725 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sat, 26 Feb 2022 19:05:39 +0100
+Subject: [PATCH 2/2] Do not compress manpages, this is done by the package
+ manager
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+ man/CMakeLists.txt | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
+index 499d9297..974aea4b 100644
+--- a/man/CMakeLists.txt
++++ b/man/CMakeLists.txt
+@@ -9,27 +9,23 @@ mark_as_advanced(HELP2MAN)
+ if (HELP2MAN)
+   set(MAN_INCLUDE "${PROJECT_SOURCE_DIR}/man/extra.groff")
+   set(MAN_PAGE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1")
+-  set(MAN_FILE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1.gz")
+ 
+   add_custom_command(
+-      OUTPUT ${MAN_FILE}
++      OUTPUT ${MAN_PAGE}
+       COMMAND ${HELP2MAN} --no-info -i ${MAN_INCLUDE} -o ${MAN_PAGE} --version-string=${PROJECT_VERSION} --name="open-source hand note-taking program" ${CMAKE_BINARY_DIR}/src/xournalpp
+-      COMMAND gzip -n -f -9 ${MAN_PAGE}
+       DEPENDS ${CMAKE_BINARY_DIR}/src/xournalpp
+   )
+ 
+   set(MAN_PAGE_THUMBNAILER "${CMAKE_CURRENT_BINARY_DIR}/xournalpp-thumbnailer.1")
+-  set(MAN_FILE_THUMBNAILER "${CMAKE_CURRENT_BINARY_DIR}/xournalpp-thumbnailer.1.gz")
+ 
+   add_custom_command(
+-      OUTPUT ${MAN_FILE_THUMBNAILER}
++      OUTPUT ${MAN_PAGE_THUMBNAILER}
+       COMMAND ${HELP2MAN} --no-info  --no-discard-stderr -o ${MAN_PAGE_THUMBNAILER} --version-string=${PROJECT_VERSION} --name="creates thumbnails" ${CMAKE_BINARY_DIR}/src/xoj-preview-extractor/xournalpp-thumbnailer
+-      COMMAND gzip -n -f -9 ${MAN_PAGE_THUMBNAILER}
+       DEPENDS ${CMAKE_BINARY_DIR}/src/xoj-preview-extractor/xournalpp-thumbnailer
+   )
+ 
+-  add_custom_target(manpage ALL DEPENDS ${MAN_FILE} ${MAN_FILE_THUMBNAILER})
+-  install(FILES ${MAN_FILE} ${MAN_FILE_THUMBNAILER} DESTINATION "share/man/man1")
++  add_custom_target(manpage ALL DEPENDS ${MAN_PAGE} ${MAN_PAGE_THUMBNAILER})
++  install(FILES ${MAN_PAGE} ${MAN_PAGE_THUMBNAILER} DESTINATION "share/man/man1")
+ else(HELP2MAN)
+   message("help2man is missing; no man pages will be generated")
+ endif(HELP2MAN)
+-- 
+2.34.1
+
diff --git a/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch b/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch
new file mode 100644
index 000000000000..0698bc443fda
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch
@@ -0,0 +1,31 @@
+From 9686113b760cf5838a63ba6bee438ec3b7ab99e8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sat, 26 Feb 2022 19:01:17 +0100
+Subject: [PATCH 1/2] Do not explicitly strip the thumbnailer (why?)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
+---
+ src/xoj-preview-extractor/CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/xoj-preview-extractor/CMakeLists.txt b/src/xoj-preview-extractor/CMakeLists.txt
+index 50d1b410..b653d983 100644
+--- a/src/xoj-preview-extractor/CMakeLists.txt
++++ b/src/xoj-preview-extractor/CMakeLists.txt
+@@ -41,10 +41,6 @@ target_include_directories (xournalpp-thumbnailer PRIVATE ${librsvg_INCLUDE_DIRS
+ 
+ set (THUMBNAILER_BIN "xournalpp-thumbnailer")
+ 
+-add_custom_command (TARGET xournalpp-thumbnailer POST_BUILD
+-  COMMAND ${CMAKE_STRIP} ${THUMBNAILER_BIN}
+-)
+-
+ ## Install ##
+ 
+ install (TARGETS xournalpp-thumbnailer
+-- 
+2.34.1
+
diff --git a/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild b/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..761bc8769f66
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake 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"
+fi
+
+DESCRIPTION="Handwriting notetaking software with PDF annotation support"
+HOMEPAGE="https://github.com/xournalpp/xournalpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+COMMONDEPEND="
+	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="${COMMONDEPEND}
+"
+DEPEND="${COMMONDEPEND}
+"
+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"
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
diff --git a/app-text/xournalpp/xournalpp-1.1.1.ebuild b/app-text/xournalpp/xournalpp-1.1.1.ebuild
new file mode 100644
index 000000000000..2c5a3a5f0527
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-1.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake 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"
+fi
+
+DESCRIPTION="Handwriting notetaking software with PDF annotation support"
+HOMEPAGE="https://github.com/xournalpp/xournalpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+COMMONDEPEND="
+	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="${COMMONDEPEND}
+"
+DEPEND="${COMMONDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	sys-apps/lsb-release
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild
index a2510c4f8952..761bc8769f66 100644
--- a/app-text/xournalpp/xournalpp-9999.ebuild
+++ b/app-text/xournalpp/xournalpp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
 
@@ -10,8 +10,8 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
 	unset SRC_URI
 else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz"
+	KEYWORDS="~amd64 ~ppc64"
+	SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
 fi
 
 DESCRIPTION="Handwriting notetaking software with PDF annotation support"
@@ -26,6 +26,7 @@ COMMONDEPEND="
 	dev-libs/glib
 	dev-libs/libxml2
 	dev-libs/libzip:=
+	gnome-base/librsvg
 	media-libs/portaudio[cxx]
 	media-libs/libsndfile
 	sys-libs/zlib:=
@@ -38,8 +39,14 @@ DEPEND="${COMMONDEPEND}
 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"
+)
+
 src_prepare() {
 	cmake_src_prepare
 }