From 2d3042634af4767714cb90eff3f773ef54afb5ed Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 29 May 2023 03:16:09 +0100
Subject: gentoo auto-resync : 29:05:2023 - 03:16:09

---
 app-text/xournalpp/Manifest                  |  8 ++--
 app-text/xournalpp/xournalpp-1.1.1-r1.ebuild | 52 -------------------------
 app-text/xournalpp/xournalpp-1.1.1-r2.ebuild | 49 -----------------------
 app-text/xournalpp/xournalpp-1.1.1-r3.ebuild | 48 +++++++++++++++++++++++
 app-text/xournalpp/xournalpp-1.1.3-r1.ebuild | 58 ----------------------------
 app-text/xournalpp/xournalpp-1.1.3-r2.ebuild | 57 +++++++++++++++++++++++++++
 app-text/xournalpp/xournalpp-1.1.3.ebuild    | 49 -----------------------
 app-text/xournalpp/xournalpp-9999.ebuild     |  1 -
 8 files changed, 108 insertions(+), 214 deletions(-)
 delete mode 100644 app-text/xournalpp/xournalpp-1.1.1-r1.ebuild
 delete mode 100644 app-text/xournalpp/xournalpp-1.1.1-r2.ebuild
 create mode 100644 app-text/xournalpp/xournalpp-1.1.1-r3.ebuild
 delete mode 100644 app-text/xournalpp/xournalpp-1.1.3-r1.ebuild
 create mode 100644 app-text/xournalpp/xournalpp-1.1.3-r2.ebuild
 delete mode 100644 app-text/xournalpp/xournalpp-1.1.3.ebuild

(limited to 'app-text/xournalpp')

diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
index 4606ca48bbd0..f9e436a0a8ce 100644
--- a/app-text/xournalpp/Manifest
+++ b/app-text/xournalpp/Manifest
@@ -4,9 +4,7 @@ AUX xournalpp-1.1.3-gcc13.patch 245 BLAKE2B 32593e41947d39cc13b4012ef7f8b42d422d
 AUX xournalpp-1.1.3-lua-5-4.patch 402 BLAKE2B fe257a01a3a42306cbded7311b9974db5f19d91a5e616aa9fc063747f3dca2f76e6c79ed7a1e9027fb2826b4064c4d6b28b7859cdc5e27f677faf411819bfff0 SHA512 94889468a810910bc955cdce7e0b4f6b52ae31bab36d7b9fdb03ef7221028e5fa0f3ceebf932c4fcbedb967240f70579a8a0bd6ee81936bdd183619d21cef1d4
 DIST xournalpp-1.1.1.tgz 15093900 BLAKE2B 87988bc78a0d904f1e3533e393bcdfc7b76517f6cc13343cb63ceaa83de25eca885274238ce45840334ea653964c9cd1834fc22d5b2c89a731ae5616f01f22c8 SHA512 efba97d26f624e3a1b8164ef6333a0f1d2992d0245414bdb51692d845965f6c37071f687520b43a94f713465796a16cbafd8929fd3bf8e6c3face847df92251d
 DIST xournalpp-1.1.3.tgz 15096883 BLAKE2B 814aea3510f26f9478280d158cfa32bafd168df6a21e6776cc831f4d41a69b4dd596df3bac990d28851bba933b6c448f1e38109042bd02cd7454985aaac8d13b SHA512 7b3f1507a8f7b2b5ebef093e319008d4bc14b961ab528af490d133bc64176b85b14a4002753f5444f8fd96c326e7c6cf5d1bad443ad7ce2ea56e9f465aacae3d
-EBUILD xournalpp-1.1.1-r1.ebuild 1019 BLAKE2B cfb457309d08b611980b8e0d8d995f4274b48126c64fee196296b7a89983149f5b76500aba2fd0c10e61b7db57257d8684b5d93b3476791ad70ec47af907280e SHA512 5c31277a74affc8d22e7bbf51e9ea78b53d51b01126bc95ea5210bfdeffa60a2cd7882911a6a00a0e8b225a26d79c9ad53e52055736981eae4c45f0dfe9326c1
-EBUILD xournalpp-1.1.1-r2.ebuild 1108 BLAKE2B 239c6f06ad94379001e67a2a4d9203f4cfec3c118606053ef15c1f60361ee769e9aa8df0bd185facb864b0d1382d875074f4c5554846406499037c65e30751b3 SHA512 c85e97819a87db887ded20a1474a54b12a253053cb8529d7c2f039aabf49a6dfdf67e6af7856e5abbb4b1c6499e2a35b32926dba0223f806de0210251e2b2f52
-EBUILD xournalpp-1.1.3-r1.ebuild 1233 BLAKE2B ffdc361f6cb2f7c4563a3367deb423525844564e6a7ba2c01c941186f70abf87cf6b3c3ee3f031b1437a252e62b5b3d87f213e52ab6ae5cedd8f5ed095340135 SHA512 a6313dcafeefbbae0c5cf67380694da39eb75447435428bc327862571d99aeb6f1cd2509d2881e8bdfd8d1f65064fa1cad307726edc8416f4e1e804caf43d3db
-EBUILD xournalpp-1.1.3.ebuild 1109 BLAKE2B c87136070924c6a64ed71705ef7353f3ecc4a4cd5ab201bab3805b113dc407dde7ffa40301c485e52f887a801d52e2555489169b1d5574dec7674d135127e60a SHA512 4f09a601ac97fc76d606a37d7d99400a10eda5662dc3b5307394928e14e815def45dfd46607f8e9dc59658a188b697f687cebaf7eb16a6f8df261d78c29063f2
-EBUILD xournalpp-9999.ebuild 1233 BLAKE2B ffdc361f6cb2f7c4563a3367deb423525844564e6a7ba2c01c941186f70abf87cf6b3c3ee3f031b1437a252e62b5b3d87f213e52ab6ae5cedd8f5ed095340135 SHA512 a6313dcafeefbbae0c5cf67380694da39eb75447435428bc327862571d99aeb6f1cd2509d2881e8bdfd8d1f65064fa1cad307726edc8416f4e1e804caf43d3db
+EBUILD xournalpp-1.1.1-r3.ebuild 1069 BLAKE2B 339ca036731952260978f16d9897d9a23cf11b96a48fbd06c072afecc69d89bf6e3e90a8749bf6644cb83aa4f30165d920ee155ca81bd637912caa2ed343e8c3 SHA512 911377ec94ce1ed96c66bc8b47caa056af2b9b6ef043cb753be01ea406c0fc764f66480b2020040ffcf168ed23575785569a398f67c67f9fc72d3128fed7c42b
+EBUILD xournalpp-1.1.3-r2.ebuild 1194 BLAKE2B 0e66dd64b40afca34bf01129d36d6e269179fcb0bbc369a9a49e55cc301fcd77e9526d6fa484354c9d0b6ed799daa7926bb894176fea37a8e5f5434e0eb571df SHA512 8a94a24b965f915883433c3ff1cf6fe4fe43aed81a9b765cdce4714cd944ee0baea86c069b30e09fb19fdca8264d95f70f9e93310f92275184534109e599b800
+EBUILD xournalpp-9999.ebuild 1194 BLAKE2B 0e66dd64b40afca34bf01129d36d6e269179fcb0bbc369a9a49e55cc301fcd77e9526d6fa484354c9d0b6ed799daa7926bb894176fea37a8e5f5434e0eb571df SHA512 8a94a24b965f915883433c3ff1cf6fe4fe43aed81a9b765cdce4714cd944ee0baea86c069b30e09fb19fdca8264d95f70f9e93310f92275184534109e599b800
 MISC metadata.xml 305 BLAKE2B a0f91402d7c9940c0e0a6c6fd9d6785751734fddea3c57025889ef4037238e8f0db013b4d08d3398254936e83d17dd97aa011d23be3bae2853ac6954314b3ea8 SHA512 083227ced431d1b53984d271d76f1fc9c16f894c81355662aca8cb3545493cea7bcf9daa5e7a309c04a8006b5512edeadc0e969e76011c4f33f222c48dec57cb
diff --git a/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild b/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild
deleted file mode 100644
index fdf5361b9d3c..000000000000
--- a/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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-r2.ebuild b/app-text/xournalpp/xournalpp-1.1.1-r2.ebuild
deleted file mode 100644
index 65f5ff07e869..000000000000
--- a/app-text/xournalpp/xournalpp-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 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-1.1.1-r3.ebuild b/app-text/xournalpp/xournalpp-1.1.1-r3.ebuild
new file mode 100644
index 000000000000..cd729ea77198
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-1.1.1-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 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
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.1-nostrip.patch"
+	"${FILESDIR}/${PN}-1.1.1-nocompress.patch"
+)
diff --git a/app-text/xournalpp/xournalpp-1.1.3-r1.ebuild b/app-text/xournalpp/xournalpp-1.1.3-r1.ebuild
deleted file mode 100644
index 3e95f5804d98..000000000000
--- a/app-text/xournalpp/xournalpp-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-3 lua5-4 )
-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"
-	"${FILESDIR}/${PN}-1.1.3-lua-5-4.patch"
-	"${FILESDIR}/${PN}-1.1.3-gcc13.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DLUA_VERSION="$(lua_get_version)"
-	)
-
-	cmake_src_configure
-}
diff --git a/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild b/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild
new file mode 100644
index 000000000000..681bb9a2a3cf
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-3 lua5-4 )
+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
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.1-nostrip.patch"
+	"${FILESDIR}/${PN}-1.1.1-nocompress.patch"
+	"${FILESDIR}/${PN}-1.1.3-lua-5-4.patch"
+	"${FILESDIR}/${PN}-1.1.3-gcc13.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DLUA_VERSION="$(lua_get_version)"
+	)
+
+	cmake_src_configure
+}
diff --git a/app-text/xournalpp/xournalpp-1.1.3.ebuild b/app-text/xournalpp/xournalpp-1.1.3.ebuild
deleted file mode 100644
index ed81011852b5..000000000000
--- a/app-text/xournalpp/xournalpp-1.1.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 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 3e95f5804d98..681bb9a2a3cf 100644
--- a/app-text/xournalpp/xournalpp-9999.ebuild
+++ b/app-text/xournalpp/xournalpp-9999.ebuild
@@ -39,7 +39,6 @@ DEPEND="${COMMON_DEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	sys-apps/lsb-release
-	elibc_musl? ( sys-libs/libbacktrace )
 "
 
 PATCHES=(
-- 
cgit v1.2.3