gentoo resync : 21.06.2020

4 files changed, 101 insertions, 0 deletions

diff --git a/x11-misc/xdiskusage/Manifest b/x11-misc/xdiskusage/Manifest
index 2c0857a9df4f..a277ba7cb8c5 100644
--- a/x11-misc/xdiskusage/Manifest
+++ b/x11-misc/xdiskusage/Manifest
@@ -1,3 +1,7 @@
+AUX xdiskusage-1.52-flags-order.patch 1544 BLAKE2B c4a639648cc32e76ab3aa50e3733abe38ce34cd17bc183f6e4e0687b65930f9c50b07bbec58be5ba4ccf3625b027851bae4e7e299169b73c5096bbd5f8727932 SHA512 76d8910ecf96af79e2405dff1307e79343078dd125810b20024f5c6b82fc8d46dfea9ab0a332af3918f37801b1bd59501363dd3edc1cf79c583d1c59f2eef23d
+AUX xdiskusage-1.52-pathbuf.patch 334 BLAKE2B f37d93288cff512a198c05759f50570c09a9e358d93667737198909d3507204f48bd47b549d8393f327ab5fd84d90471968f1517aee4301336db35036a016812 SHA512 09687a437bb99d478de119a3c46398e272fbf0db5d0cd3391858e72b364cc54ea96cd5512789ed00f115fc0e9565eaa6471db3669b9169e39583131563b1c85c
 DIST xdiskusage-1.51.tgz 54248 BLAKE2B a1e41eef4e3d303c7bc02cb485ab2ca33bb03c57f9713459b68621a611751f5af35be9918bbef86294e70ddcc8e2fb678b5dfa9baa237954a46fd12120bbf96f SHA512 73335bbd5dc3e1f753efb84e7921fe7568f83daae7c4026c8b23fbacc4257b885de56f4dc8f682b03663a56f7def1227b8a4b6abf419aff8ecdd26ae51d4885a
+DIST xdiskusage-1.52.tgz 54458 BLAKE2B 6e91402c4e43e1dfafbd2e689282aea1305ac309a491fd410b16502b2176cfe9a8b17a7379eef5ddea074cc550e7801d91c13db0a7b119b3ab48f32f786f0e5b SHA512 d561f84ca2c8ff73a9abe8c6e34baed430aaa6c6793064b2aa5856249dd4b309d50c3f6b19824a8c948aa8a71f7a3056771937fdce3f3fcb8f2fc8b0f39cdf54
 EBUILD xdiskusage-1.51.ebuild 586 BLAKE2B 5ec139ccb463bf6bd0a6aee0764911cf5bc558cc953b5c17aeab83042288f974995d9c96ea68fe0eceacc1991c5e445b1d152667d47b86378db69fd1eb74a9b6 SHA512 aa6921eb15f6748483dbc3631c99c0c95a9b3133ec7188ebf9c13ace3c84ee15c3bb99b0c18d7193cac18b03f0ca91b6eaf16671cf7a26ed6bb28ab2eacb748c
+EBUILD xdiskusage-1.52.ebuild 675 BLAKE2B bcc0b178091a6b2bc7ae3e30ffb585c504d767b0a6e4024bfa7a68a5ecda637ada2934d5f5184575f7de9e921bfe5e15269073df55dc244907b004c69ae7b102 SHA512 b1b53a166537e46f2b85853f059bb4bc98ef7d25ad0d07e47a84c63505a7f0a70ea45a80863859da2bb7e4c625d2536f9601e8b2295ec5705db58aba6ce6e22e
 MISC metadata.xml 366 BLAKE2B 740f17c401fabc3c0a47e332dbcda1c7d6501bf52140a32c3f552dbf05e278394df9c96da54dfd17d366633b091279e144b34199e1999a4c613b9a1d8c68edf6 SHA512 70a6112f01001d3b6d064a925c778eac80c45ff1e8f5fa5474b9c21f4f27062f3eb94cf244e3996a271ab1dd1e6d28f51a201db49cb23f38f579adff27f8aad7
diff --git a/x11-misc/xdiskusage/files/xdiskusage-1.52-flags-order.patch b/x11-misc/xdiskusage/files/xdiskusage-1.52-flags-order.patch
new file mode 100644
index 000000000000..6d0e204e8b52
--- /dev/null
+++ b/x11-misc/xdiskusage/files/xdiskusage-1.52-flags-order.patch
@@ -0,0 +1,49 @@
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,7 @@
+ all:	$(PROGRAM)
+ 
+ $(PROGRAM) : $(OBJECTS)
+-	$(CXX) -o $(PROGRAM) $(OBJECTS) `fltk-config --ldflags` $(CXXFLAGS) $(LDFLAGS)
++	$(CXX) -o $(PROGRAM) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) `fltk-config --ldflags`
+ 
+ configure: configure.in
+ 	autoconf
+@@ -29,9 +29,9 @@
+ .SUFFIXES : .fl .do .C .c .H
+ 
+ .C.o :
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
++	$(CXX) $(CXXFLAGS) `fltk-config --cxxflags` -c $<
+ .C :
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
++	$(CXX) $(CXXFLAGS) `fltk-config --cxxflags` -c $<
+ .fl.C :
+ 	-fluid -c $<
+ .fl.H :
+@@ -42,7 +42,7 @@
+ 	@touch makedepend
+ 
+ depend:
+-	$(MAKEDEPEND) -I.. $(CPPFLAGS) $(CXXFILES) $(CFILES) > makedepend
++	$(MAKEDEPEND) -I.. $(CXXFLAGS) `fltk-config --cxxflags` $(CXXFILES) $(CFILES) > makedepend
+ makedepend:
+ 	touch makedepend
+ include makedepend
+@@ -73,13 +73,13 @@
+ OBJECTS_D = $(CXXFILES:.C=.do) $(CFILES:.c=.do)
+ 
+ .C.do :
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS_D) -c -o $@ $<
++	$(CXX) $(CXXFLAGS) `fltk-config --cxxflags` $(CXXFLAGS_D) -c -o $@ $<
+ .c.do :
+ 	$(CC) $(CFLAGS_D) -c -o $@ $<
+ 
+ $(PROGRAM_D) : $(OBJECTS_D)
+-	$(CXX) -o $(PROGRAM_D) $(OBJECTS_D) `fltk-config --ldflags` $(CXXFLAGS_D) $(LDFLAGS)
++	$(CXX) -o $(PROGRAM_D) $(CXXFLAGS_D) $(LDFLAGS) $(OBJECTS_D) `fltk-config --ldflags`
+ 
+ # Used to make the version that is gzipped and uploaded to web site
+ static : $(OBJECTS)
+-	$(CXX) -o $(PROGRAM) $(OBJECTS) `fltk-config --ldstaticflags` $(CXXFLAGS) $(LDFLAGS)
++	$(CXX) -o $(PROGRAM) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) `fltk-config --ldstaticflags`
diff --git a/x11-misc/xdiskusage/files/xdiskusage-1.52-pathbuf.patch b/x11-misc/xdiskusage/files/xdiskusage-1.52-pathbuf.patch
new file mode 100644
index 000000000000..a78372c050c4
--- /dev/null
+++ b/x11-misc/xdiskusage/files/xdiskusage-1.52-pathbuf.patch
@@ -0,0 +1,11 @@
+--- a/xdiskusage.C
++++ b/xdiskusage.C
+@@ -458,7 +458,7 @@
+   } else {
+     if (!disk) {
+       // follow all symbolic links...
+-      strncpy(pathbuf, path, 1024);
++      strncpy(pathbuf, path, 1024 -1);
+       for (int i=0; i<10; i++) {
+ 	char *p = (char*)fl_filename_name(pathbuf);
+ 	int j = readlink(pathbuf, p, 1024-(p-pathbuf));
diff --git a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild
new file mode 100644
index 000000000000..7449a2fa676e
--- /dev/null
+++ b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="user-friendly program to show you what is using up all your disk space"
+HOMEPAGE="http://xdiskusage.sourceforge.net/"
+SRC_URI="http://xdiskusage.sourceforge.net/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=x11-libs/fltk-1.3:1
+"
+BDEPEND="
+	${RDEPEND}
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.52-flags-order.patch
+	"${FILESDIR}"/${PN}-1.52-pathbuf.patch
+)
+
+src_compile() {
+	# override FLAGS set by configure
+	emake CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README
+}