gentoo resync : 16.09.2020

4 files changed, 97 insertions, 0 deletions

diff --git a/x11-misc/xsensors/Manifest b/x11-misc/xsensors/Manifest
index 9cdbf4fd2fcc..250a5f509600 100644
--- a/x11-misc/xsensors/Manifest
+++ b/x11-misc/xsensors/Manifest
@@ -1,4 +1,8 @@
 AUX xsensors-0.70-gtk220.patch 1566 BLAKE2B a36a31d4a7810d77d5ee3d451936a111204570863c253d7a6afdd7d058b87ea58efa494a048f32b29cb152b30025a1f23d5bad18d0a14ee481ee909f373b692a SHA512 24196915ebde6264a5ec364539ede4827459a87e675dff3e187a556d4adb24ee0efb41db49fe2ae0c94e5ab467eb3caff205df28d30c15c8bca9f78641324199
+AUX xsensors-0.80-Werror.patch 470 BLAKE2B 6754c97e1182c696acd47a101b27889e6efec3e45448d7b19802ba0f2e0fcce35df26dfc517a10ee631bbe36f3ef948cfccb98f102085ca97981e8c61a779131 SHA512 b069009cb470ac224d74669fb8b92dbaa090d18e780eb820599cb413da89fae1f271b831900de15bbe5c209f6b667ab5dd3b9868e14dafa278b1d3319380ddad
+AUX xsensors-0.80-gtk220.patch 1205 BLAKE2B ae7b2d77ae0083ec60971f2b56b5d0a67ed6ac0f5c76dada91ce9f3a6e53eda026292d2c33b8a636966fb11f3c13a1ac5b150ec60e25a38d460499d43c2805e0 SHA512 3d1a8b9042df478b2af69a94f7682aca15826ae8464396e16372aabb1674b9e483c83d19e6f2412baaebc4811a80a2fd5a8cf78575969dceae1bc20e5fa8eb10
 DIST xsensors-0.70.tar.gz 115430 BLAKE2B af18fa723a9e6b84df62d0ea0397d7b30ab800816b84449f91357aa75d99944796ae8164171bd217118dd93ef713d286fe435354614baef7947f3f851b368df9 SHA512 34f038b192f3cecb2e7587e19c4837b795a2705e6d0e9ea2bd3ead6d3259a1dded364fcfc70fa5e37d64f32c879e1dd9c6e43dcf32fa9aeb73ee5cc49bf290a4
+DIST xsensors-0.80.tar.gz 214763 BLAKE2B 7be4c0ef0f59e7c8c8b32b7e132acb906c9ab64e6e0f63a3316691eef8dd2f8b659d4e40d2213cf580cc4874bcba2fefad4f6a759bf349e18ebef12a99c91128 SHA512 e1ac7107b978bf9b392b0ecb13e49f49c8efebb228a9c6781a519b128f467d0346d35632646f20a036fdc34ea3ee86440c7be5a3285d922f8afbf051e9cfdcc8
 EBUILD xsensors-0.70-r1.ebuild 696 BLAKE2B f8301d03329e2339b23679b11bd6a0752e1b30bb67da54b54caba8089893d07f3ff09081a455fbc9aca70734e62a0e76c0776cfb7dfde4079027ae2f41f3e3e0 SHA512 eeead03d0ca6b8216097301b7af41b655a2d081fc8e32c91d25c0d3fdaa6ef20db5e293b1ddc618f5ee4c474ae3f26087da6f420e431dadf7a5793fa44ef00f5
+EBUILD xsensors-0.80.ebuild 750 BLAKE2B 2d433a5fa6d4e4aaeaae36e7034425798c7b6cab9be1dc6809c796c3599a699c649935f96f0c53a4b7098859188866deb84fc41ed9dbcb14c84d47ee34b19d46 SHA512 b272acbd41d732f00fb7ca33d3660c471c0599ca531c7305b13ddce074909d1809dee7f0df17efddd8e742d25006097fba938d5053e8d6bb322af8f11922b0e2
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsensors/files/xsensors-0.80-Werror.patch b/x11-misc/xsensors/files/xsensors-0.80-Werror.patch
new file mode 100644
index 000000000000..b903404256ac
--- /dev/null
+++ b/x11-misc/xsensors/files/xsensors-0.80-Werror.patch
@@ -0,0 +1,14 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -4,10 +4,7 @@
+ 	-DG_LOG_DOMAIN=\"GnomeCPUInfoApplet\"				\
+ 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
+ 	-DDATADIR=\""$(datadir)"\"					\
+-	-DG_DISABLE_DEPRECATED		-DGTK_DISABLE_DEPRECATED	\
+-	-DGDK_DISABLE_DEPRECATED	-DGNOME_DISABLE_DEPRECATED	\
+-	-ansi	-Wall	-Wmissing-prototypes	-Wmissing-declarations \
+-    -Werror
++	-ansi	-Wall	-Wmissing-prototypes	-Wmissing-declarations
+ 
+ bin_PROGRAMS = xsensors
+ 
diff --git a/x11-misc/xsensors/files/xsensors-0.80-gtk220.patch b/x11-misc/xsensors/files/xsensors-0.80-gtk220.patch
new file mode 100644
index 000000000000..9b53de088647
--- /dev/null
+++ b/x11-misc/xsensors/files/xsensors-0.80-gtk220.patch
@@ -0,0 +1,34 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,7 +29,7 @@
+             [Force GTK2 GUI, even if GTK3 is available @<:@default=check@:>@])],
+             [], [with_gtk2=no])
+ 
+-if [ test "x$with_gtk2" == xno ]; then
++if [ test "x$with_gtk2" = xno ]; then
+     PKG_CHECK_MODULES([GTK],[gtk+-3.0],foundgtk3=true,foundgtk3=false)
+ else
+     echo "Using GTK2..."
+@@ -37,18 +37,13 @@
+ fi
+ 
+ if [ $foundgtk3 ]; then
+-	XSENSORS_CFLAGS="`pkg-config --cflags gtk+-3.0` -Werror -Wall"
+-	XSENSORS_LIBS="`pkg-config --libs gtk+-3.0`"
++	XSENSORS_CFLAGS="`${PKG_CONFIG} --cflags gtk+-3.0` -Wall -Wall"
++	XSENSORS_LIBS="`${PKG_CONFIG} --libs gtk+-3.0`"
+ else
+-    if [ test "x$with_gtk2" == xno ]; then
+-        echo "GTK3 is not installed, checking for GTK2 instead..."
+-    fi
+-	AM_PATH_GTK_2_0(2.8.0,,AC_MSG_ERROR([
++    AC_MSG_ERROR([
+ *** GTK+ is required to build xsensors; please make sure you have the GTK+
+ *** development headers installed. The latest version of GTK+ is
+-*** always available at http://www.gtk.org/.]))
+-	XSENSORS_CFLAGS="`pkg-config --cflags gtk+-2.0` -Werror -Wall"
+-	XSENSORS_LIBS="`pkg-config --libs gtk+-2.0`"
++*** always available at http://www.gtk.org/.])
+ fi
+ 
+ AC_SUBST(XSENSORS_CFLAGS)
diff --git a/x11-misc/xsensors/xsensors-0.80.ebuild b/x11-misc/xsensors/xsensors-0.80.ebuild
new file mode 100644
index 000000000000..43258aef8b99
--- /dev/null
+++ b/x11-misc/xsensors/xsensors-0.80.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A hardware health information viewer, interface to lm-sensors"
+HOMEPAGE="https://github.com/Mystro256/xsensors/"
+SRC_URI="https://github.com/Mystro256/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=sys-apps/lm-sensors-3
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-gtk220.patch
+	"${FILESDIR}"/${P}-Werror.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --without-gtk2
+}
+
+src_install() {
+	default
+
+	rm -r "${ED}"/usr/share/appdata || die
+}