gentoo resync : 16.09.2020

3 files changed, 74 insertions, 0 deletions

diff --git a/x11-misc/hsetroot/Manifest b/x11-misc/hsetroot/Manifest
index e4e8d359165b..68d6f69f482f 100644
--- a/x11-misc/hsetroot/Manifest
+++ b/x11-misc/hsetroot/Manifest
@@ -1,7 +1,10 @@
 AUX hsetroot-1.0.2-underlinking.patch 500 BLAKE2B 62758446bca47b8e8ff8b58d3e370a1e51ccc6e22c5936d3baca522eb4eb13881649c447c8310a0e03cc03d934e83f75067f841175e4c1edc766396cf54f0bb5 SHA512 b36eca913e9477b8282351ce739a76c088a64707d0028518a3b2cb3c3050c8d7f722243437cdb55109fd8dcdd56e74c13bf67039aaf4a2cc75372f14e1ce09d6
+AUX hsetroot-1.0.5-XOpenDisplay.patch 346 BLAKE2B 975ebe306ce78411912d676b8334b31c47e3b96a8551a93c0cabd84b9782bbfd1c8e87cc6e1a49c7fcbbf3b8e33b69e69fa7a3cf0e1cf105bb90e4b038707a65 SHA512 2e6b9666e2a79a4dc65e1393018d79848e72b73290bd65bb8316ceaef741ae835385190b0e3592fd9175c68c402c504a679a22cebf8b8684c759787c49d70173
 DIST hsetroot-1.0.2.tar.gz 125535 BLAKE2B 351c022e11e3d82118db451eb6d64ff765018a09fe1ac9cc3b437f7a351d575fca66619fde9671d297b346af7c7f265442d18115388d984554bf1f9af9fbe82d SHA512 51788a6b579b82368ef5e11255ff56e2db978a02f7ad752ba64ec33c56ae5f27c1f0ef3452725d1c7bdb9d97b8a3a5b64422031c9c75a7279c407b8772d5edc3
+DIST hsetroot-1.0.5.tar.gz 12878 BLAKE2B 54e80f00d140a83a950d98663db6555a00ac770bd85826b17d8293e3af27cba2a45c2da5e4c185ca90c6adc35bbf2ccdaa3722d015b31654d5e35f4e65a61366 SHA512 b43f7cd75886e72cb6134446d383d7d9a684c818f2d8a0f829670c8dfca5eaaa1eb6c25f30dda41f3483609b25e8a44a3a3cb3a969bba7f77a9b9df712fa2167
 DIST hsetroot_1.0.2-5.debian.tar.xz 4384 BLAKE2B 5ea72b6017a90bdf36030334c021cef1000ca29370f359f2596feea69365ebe5bd6b58286b109ca63a16dc953aea1f873ee4a7eadd50432655093d2dd7e6249d SHA512 5f1dbb00daebf6b8c9db77a51dbc463ea92b4564e0d7a2dac1ea9c316dd2e2126fb8c6454f4d1eddfd19533297e29651444987a7eacb7c0080e26c14383c827d
 DIST hsetroot_1.0.2.orig.tar.gz 125621 BLAKE2B 932acda46653d2211c528008dad14c8877b0b6ace0888da19e1316af58a39b0cde0464f5dd058b752d7d95dd6d69deefc254a0a445e37077c4b177ddedf74809 SHA512 cac98cc602fd8825dbfce27d289dc4ba47805c99c78de804e95c539e83ffae6984601a535cdb90658536a007a5f17c71e27e4c31af562ade6610f11f0d0d2ca5
 EBUILD hsetroot-1.0.2.ebuild 741 BLAKE2B ef440b29711e148c34e1f067d7269005afd3ab326c470c9f181d06719c699092219c93737e0f13b2dad111544169f3b6bf280a81b0fb2ba925f934a54d62ea84 SHA512 d46a6a728b029768ff522fbc39067c8f267bd5f27228ef944c82aca9102c5901c56390d2554b709b21e3a007d7ab5f5eb25e860209abd84159e91eaa307acd47
 EBUILD hsetroot-1.0.2_p5.ebuild 975 BLAKE2B afbd38010572cefa7f952d823e90e7e51b826992ef755885c597c1565022a1367793a138e146afbfd62944282cb6fda8f77dc1a532a20d34e47489727fb15539 SHA512 d479998a4d0fbf213aef85fa806fb60dd73f4a6aefad21c887025e08019752886262922c88ccbc5828e0bc06c878720dd2d99ce5d7bbb274564df209b2964ad4
+EBUILD hsetroot-1.0.5.ebuild 1156 BLAKE2B a0623f8e1a2b1ffedaaaca8ed84c9827163ae93990bf1464335a600010124de156240e15dc7b31b3b523026bba4c22aeae2f2b558346c44780c2d6f894f08cd2 SHA512 2132975b975ea54942e3a892483db1de9237603ead8b4230b746b5f25c6b380785bd149f21251b5cb6096f1ca8d7ee0c8d2d493ea2602d36e91934160135a81b
 MISC metadata.xml 1187 BLAKE2B 68310d07fff41e0af94b70fe62f253de23b966e0689bb33ffb699b6cea3e06cebb137556e9c8d871dd92a261e4db979ac590de0233e86862c3dc2c545c6e63f1 SHA512 30bd381778a254be23fc5b4554b42cd846229ba6c67914fa173c8d429f2ffd3f7a9de5497d5205cf0e1a455d2d0bdfe1a368352d0e25bcb2a173f7b7b76bc3c8
diff --git a/x11-misc/hsetroot/files/hsetroot-1.0.5-XOpenDisplay.patch b/x11-misc/hsetroot/files/hsetroot-1.0.5-XOpenDisplay.patch
new file mode 100644
index 000000000000..0585072538f2
--- /dev/null
+++ b/x11-misc/hsetroot/files/hsetroot-1.0.5-XOpenDisplay.patch
@@ -0,0 +1,15 @@
+--- a/hsr-outputs.c
++++ b/hsr-outputs.c
+@@ -47,7 +47,11 @@
+ int
+ main(int argc, char **argv)
+ {
+-	Display *display = XOpenDisplay(NULL);
++	Display *display;
++	if (!(display = XOpenDisplay(NULL))) {
++		fprintf(stderr, "Cannot open X display!\n");
++		exit(123);
++	}
+ 
+ 	enum Format format = TEXT;
+ 	void (*print)(XineramaScreenInfo*) = print_text;
diff --git a/x11-misc/hsetroot/hsetroot-1.0.5.ebuild b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
new file mode 100644
index 000000000000..cde4912ca941
--- /dev/null
+++ b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Tool which allows you to compose wallpapers ('root pixmaps') for X"
+HOMEPAGE="https://github.com/himdel/hsetroot/"
+SRC_URI="
+	https://github.com/himdel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	>=media-libs/imlib2-1.0.6.2003[X]
+	x11-libs/libX11
+	x11-libs/libXinerama
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DOCS="AUTHORS ChangeLog NEWS README"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.5-XOpenDisplay.patch
+)
+
+src_compile() {
+	# Avoid the Makefile that replaced autotools
+	tc-export CC PKG_CONFIG
+	local tgt hsr_comp_args
+	for tgt in ${PN} hsr-outputs; do
+		hsr_comp_args=(
+			${CFLAGS}
+			$("${PKG_CONFIG}" --cflags x11 imlib2 xinerama)
+			${LDFLAGS}
+			${tgt}.c
+			$("${PKG_CONFIG}" --libs x11 imlib2 xinerama)
+			-o ${tgt}
+		)
+		echo ${hsr_comp_args[@]}
+		"${CC}" ${hsr_comp_args[@]} || die
+	done
+
+}
+
+src_install() {
+	dobin ${PN} hsr-outputs
+	dodoc README.md
+}