gentoo resync : 29.12.2022

6 files changed, 193 insertions, 5 deletions

diff --git a/dev-libs/libg15render/Manifest b/dev-libs/libg15render/Manifest
index 8b0df6f4a400..de8186deadda 100644
--- a/dev-libs/libg15render/Manifest
+++ b/dev-libs/libg15render/Manifest
@@ -1,5 +1,10 @@
 AUX libg15render-1.2-freetype_pkgconfig.patch 1660 BLAKE2B ac8e1a850a796592a248e9a5231376d906aee234a57c075af76a9c812f27f401e9e6eba79eec5dc6abeaf72968c99a39b0213bfbaf8d72e48037e0b69af35961 SHA512 f06d0d85924c543dfc8a9593e9c99ee6394f3032f57d1059d7c47698aab99b263d2d17ecfc0089375f3c59531a4f990edd11974dfd5962939b301c7975c24c10
 AUX libg15render-1.2-pixel-c.patch 686 BLAKE2B a6273daa806090247eab17e2f03f3baa3fbcd7ffe4ee502611a4ecb39134dea809a46d77243c61e949f732b9f7fabd7a7002cc0434dad7e7986da1f25dc2962d SHA512 f1d40893c1f2f17d42c9ca6941d802e0c22a5eb85d9f8167612f7bf21045c096744634ea38928ecfc30c39a6085e6b8652168e711534edf82e3d8f5243c072a4
+AUX libg15render-3.0.4-docdir.patch 716 BLAKE2B 11adf063140a938951eab6784b4cd73399d5103a6ceb7e64f59a2d56d3dc473832252bd068c5ed4384be5b1f9894926223a3ee9239a71d6da96f4fe67bcae50e SHA512 61f8e273161607d6878199225832e05d6c547f5e9ca190296b6205c1f97d3f3897a3893195819ed1528d314b76e12cab0c959f0d1ca36cda079f93df19dd692d
+AUX libg15render-3.0.4-freetype_pkgconfig.patch 1696 BLAKE2B b4a1f6e9117e74fa98d38faff8bd23d03dce13612dcf84280d12b37e1d7a7ebaa2fce94ef19a3670b5c80f131118c3ff8a30e2ca68f292477ed8ae3985346a3f SHA512 bdda475e9a479ca21c70e89e68e9bebee89b993314940869f834a6b687219359430d3944a8c0b01955f289fa7fb0cb560ba55deed4c4a0850a7ef30273f3e551
 DIST libg15render-1.2.tar.bz2 246034 BLAKE2B 70c21341949186dc65bec7ef0f695c783928ab024e5bd3f83eedc527a501bee64cf0561f5e642e3e9173f063b6f74ecca458262ee9c40a2a8837f197338bbb31 SHA512 960fd6bc6159b1b12e1de3b0c07e5960d7d5056d4927be8eddf89a911e2c97a8677ef41456aa255399e8a86cd354b848fab28a47005ee2d1b6640e0c886deaac
+DIST libg15render-3.0.4.tar.bz2 293668 BLAKE2B 82fece311baf59098d6196b5aa31d6584bf3f610854839e3dcf2318f3e3275ae9394ea2b21576d6e6cc4fffb2440d19b7322704087988de8c47e60d822949758 SHA512 f11470b4c8709b7cab8747d8eca4d55ddf88f6dd0a46f11de78612d6070c8b5ea7188ec1ea0236edbb0e5904e6dffd7c75831d5e00564b3cebf8b9dc58b0100e
 EBUILD libg15render-1.2-r2.ebuild 908 BLAKE2B b00eef7bae1cc5c90765738005428c5a440da9d9928f4342581c290a7b883dd2733cf6e2c48589a46f6791b0bec1a357f0ba2eb3802990b0f31d901f56df1237 SHA512 3395d96ff0ad3352c7794b7ef3aa65e75c13bf4f66a4b8db2d1ea47e400331b9e53ccf01663d067b730d65a2aa762eff2cd1a62ec486d34ef03bffd8ca984b83
-MISC metadata.xml 409 BLAKE2B 9b5ac727b748a784cb3e909027ae200bf988866605e2d766d2ee92ec3a9a1ae753c38733522f4d36e464aad43f489eb4debf08b8533ad21234e7269a82d4a0f6 SHA512 864b38fac10bc788122cd8cc9ce153ff45479bc4486b117290d7827ac55e6843be558c94fc563c774717c78ae8d60d5ccd210801a3d23f5beb4c81bb41c472c5
+EBUILD libg15render-3.0.4.ebuild 1032 BLAKE2B 28f64fb8740a2a6e1863a3c3076219d648f05c8dfa74f1db13ec1feea6a46c935684b6c4afac91bdde03140e1cfa8c113ae9a17ac3bebe5c4f3d901644e2a712 SHA512 f7ac050c524e6a4678ab0e58ba51fd3962c93a60827e430c049b3a13f2aba06d2b4d2b4a7b4ce7a92f1dcfabb30157522bb1600421d5417e5a6fe78ba992f2cd
+EBUILD libg15render-9999.ebuild 987 BLAKE2B 63d263a43766e6605c712f97d3dcb97ee195866d97463f0372ea565564b01289c8f811b45c292c83f9cf7af64026c18b87ec1edf45ead4dc370d2b9b1195cb09 SHA512 8439c0144154f3643acfd07b1b8c4e9ec0f8b0ca9bce22b337c1b0acb82c0194cc04ab86377b3187fbd07c63f73de7159a4ed4f10be5bfd4cb7a7e9f45b4e689
+MISC metadata.xml 297 BLAKE2B e99602692f6e8088ab7498eff9b8cba7c30e67897b51d032d52dc6b896c735e0d7e8814da90f385882e5d5ffdc27f569b77e20bce0b7d3a66edecb62e05dce51 SHA512 43e029e26caf0a8bcbcfe2e86d1f923f82e59b28aac358e53c493daae165aaa05732fc2283d50dd856967a460b0ce21a5530c599b83929f0c94ae09b76d4da79
diff --git a/dev-libs/libg15render/files/libg15render-3.0.4-docdir.patch b/dev-libs/libg15render/files/libg15render-3.0.4-docdir.patch
new file mode 100644
index 000000000000..781c9b6bfcaf
--- /dev/null
+++ b/dev-libs/libg15render/files/libg15render-3.0.4-docdir.patch
@@ -0,0 +1,25 @@
+From 2900f3f8a90915f59a25c8b3fb27912492e7b044 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sat, 14 May 2022 18:20:24 +0200
+Subject: [PATCH] Makefile.am: Make docdir selectable
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2fdacd7..cf00f1c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,7 +7,7 @@ libg15render_la_LDFLAGS = -version-info 3:0
+ include_HEADERS= libg15render.h
+ EXTRA_DIST = debian libg15render.3
+ man3_MANS = $(top_srcdir)/libg15render.3
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++docdir = @docdir@
+ doc_DATA = AUTHORS ChangeLog COPYING NEWS README
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-- 
+2.36.1
+
diff --git a/dev-libs/libg15render/files/libg15render-3.0.4-freetype_pkgconfig.patch b/dev-libs/libg15render/files/libg15render-3.0.4-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..54a8fd4c07d3
--- /dev/null
+++ b/dev-libs/libg15render/files/libg15render-3.0.4-freetype_pkgconfig.patch
@@ -0,0 +1,59 @@
+diff --git a/configure.ac b/configure.ac
+index 97338f3..a64f64c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,19 +13,41 @@ AC_PROG_CC
+ LT_INIT
+ 
+ # Checks for --enable args
+-AC_MSG_CHECKING(whether to enable FreeType2 support)
+-AC_ARG_ENABLE(ttf, [  --enable-ttf		enable FreeType2 support],
+-	if [[[ "$enableval" = "yes" ]]]; then
+-		AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support])
+-		CFLAGS="$CFLAGS `freetype-config --cflags`"
+-		FTLIB="-lfreetype"
+-		ttf_support="yes"
+-	else
+-		ttf_support="no"
+-	fi,
+-	ttf_support="no"
+-)
+-AC_MSG_RESULT($ttf_support)
++AC_ARG_ENABLE(ttf, [  --enable-ttf		enable FreeType2 support],,[enable_ttf=no])
++AS_IF([test "x$enable_ttf" != "xno"], [
++    m4_ifdef([PKG_PROG_PKG_CONFIG], [
++	PKG_PROG_PKG_CONFIG
++	PKG_CHECK_MODULES(FREETYPE, freetype2,
++		[
++			AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support])
++			CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
++			FTLIB="$FREETYPE_LIBS"
++		], [
++			AS_IF([test "x$enable_ttf" = "xyes"], [
++				AC_MSG_ERROR([Cannot find freetype2])
++			])
++		])
++	], [
++		AC_MSG_CHECKING(whether to enable FreeType2 support)
++		AC_PATH_PROG([FTCONFIG], [freetype-config])
++		AS_IF([test -n "$FTCONFIG" ], [
++			CFLAGS="$CFLAGS `$FTCONFIG --cflags`"
++			FTLIB="-lfreetype"
++			AC_DEFINE(TTF_SUPPORT, [1])
++			AC_MSG_RESULT([yes])
++		], [
++			AS_IF([test "x$enable_ttf" = "xyes"], [
++				AC_MSG_ERROR([Cannot find freetype-config])
++			], [
++				AC_DEFINE(TTF_SUPPORT, [0])
++			])
++		])
++		AC_MSG_RESULT([no])
++	]
++    )
++], [
++	AC_MSG_RESULT(No Freetype is being used)
++])
+ 
+ # Checks for libraries.
+ AC_CHECK_LIB([g15], [writePixmapToLCD], ,AC_MSG_ERROR(["libg15 not found. please install it"]))
diff --git a/dev-libs/libg15render/libg15render-3.0.4.ebuild b/dev-libs/libg15render/libg15render-3.0.4.ebuild
new file mode 100644
index 000000000000..5ac51ead28ff
--- /dev/null
+++ b/dev-libs/libg15render/libg15render-3.0.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard"
+HOMEPAGE="https://gitlab.com/menelkir/libg15render"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/menelkir/libg15render.git"
+else
+	SRC_URI="https://gitlab.com/menelkir/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="truetype"
+
+RDEPEND="
+	>=dev-libs/libg15-3.0
+	truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	truetype? ( virtual/pkgconfig )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-freetype_pkgconfig.patch"
+	"${FILESDIR}/${PN}-3.0.4-docdir.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable truetype ttf)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libg15render/libg15render-9999.ebuild b/dev-libs/libg15render/libg15render-9999.ebuild
new file mode 100644
index 000000000000..bafaecea0fdc
--- /dev/null
+++ b/dev-libs/libg15render/libg15render-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard"
+HOMEPAGE="https://gitlab.com/menelkir/libg15render"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/menelkir/libg15render.git"
+else
+	SRC_URI="https://gitlab.com/menelkir/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="truetype"
+
+RDEPEND="
+	>=dev-libs/libg15-3.0
+	truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	truetype? ( virtual/pkgconfig )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-docdir.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable truetype ttf)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libg15render/metadata.xml b/dev-libs/libg15render/metadata.xml
index f545d7a2f439..947c62c9e342 100644
--- a/dev-libs/libg15render/metadata.xml
+++ b/dev-libs/libg15render/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">g15tools</remote-id>
 	</upstream>