gentoo resync : 03.11.2019

4 files changed, 4 insertions, 62 deletions

diff --git a/x11-misc/xnots/Manifest b/x11-misc/xnots/Manifest
index 95752a549820..c559e691b720 100644
--- a/x11-misc/xnots/Manifest
+++ b/x11-misc/xnots/Manifest
@@ -1,6 +1,5 @@
-AUX xnots-0.2.1-gcc6.patch 1341 BLAKE2B 0dd960662c8cd114d29c2f3b60850a884c6e909fc2055ad8f3e671269d4e90f26565046dacfa0bad1ad0ca7229297d377a2f5b8293a5de9d0962543b4728abf9 SHA512 3d7e976f93e1a67234bcaa55dfbfe980e9e5ba95f2d8c43c29ce9ef003bf93f7924218cee45892292f11db6e6af51879e37f4aeb4a20f946fb0c73dd8d95ded7
+AUX xnots-0.2.1-gcc6.patch 1134 BLAKE2B f169cdd6236c4f068aa2661c3d937d5d97035572a4e09322531f3ab3eefd2b2dc8f4f7b529973c342dad8bb80817bb7c2888c038cf1f2c4faf8f4bd926d2ff6c SHA512 236afd11f535ae142f380926ce0c8c7a6ff299ae1718b3a946aedb7daf63da949cfd282d8f4c87975ac4ac77ef7493296e95e51a49e0adc796d8a39ed5dce7a6
 DIST xnots-0.2.1.tar.gz 41442 BLAKE2B 26579cfb5508ed1e956b027c769c9c0924870867428cdf5b569e571fce57777267f0523a9ceebabe7f2c705c7b6a34549a122d162cb547e44d8489708fb9e83c SHA512 bb1a334150aac932839c8d9e04d8c9f1c419f5221a218fbbe3523060fbb8d62e616f89ec06a8237fa290de37db103e98a560953ef820ef016f35dd5c844eb65c
-EBUILD xnots-0.2.1-r1.ebuild 945 BLAKE2B 3a6de3e865466f62b90fbf36c890dc4cdc267055116ab66cc2db11b7baefb62e417835a8a34a1c8b9e3d52409a8dd6e275c39aced90e7e984fee1e7fd69e9e9c SHA512 a09ada148a66adf4b9c2e74d520e9023f99e1a3202e478bb95b2d55ae2326de9d459a47605970a6026d38f2ae4fa177a032c24e218a9866dadcec6c76bc169a9
-EBUILD xnots-0.2.1-r2.ebuild 1008 BLAKE2B f8c1a01680373e647401a5f227db0bca49470054d18da55527bbbe93cd3506361e55d16b19e5aaf4db13f2c9b5bfccf3c5d0b227bc131ac952806ff55aa09467 SHA512 8f9a0bf4dea5c2c63ae1424cc61d0a857da9e538a2465936c45ed4f94ac6893a1483fdcf4c037be794c0d8f05ec7d4641cc38d349eafff4215d7fbc29e7412ce
+EBUILD xnots-0.2.1-r2.ebuild 1003 BLAKE2B 51e9e4a85bb183f634f50e5a2a340f006ff05fb8a1c9941041295a5e9a0b791c3e8caf7a7ae9b39e3780bf4b943dcf48e60efdfd94bc6692874c99d2eba8e093 SHA512 533815f7dd9896083a2f535857d23c10f20325a3c8cc068e3fc429b70ae502386ae500fccbc4a286a7a2e8b02dfe441a326655c9be9eba31556796d4b1c9459f
 EBUILD xnots-9999.ebuild 948 BLAKE2B 7a7183891ab4b05a031b395ceb60e853eaa13d3235ebd0fdee2d4a6dacdf0d8dfdff10319278954fda63031872ca8e37c1b7e485fb7115cb9e2432986c495aaf SHA512 854cfbd3b99291da2fecc789f3f07f37cdc56b2e367020fac9367c1c843f5087db9bac2c71c15dab520815f24988b90af0063f830849a667fbd7f15854ac76c5
 MISC metadata.xml 410 BLAKE2B 1cfb5af15dcb1f596fc9eff076b7e4bce5af2d328f1f1040167117162b0ddfa4b1aca2a6bc30fdd54732f998ffebe6f51dd042f04e8a6e211bd115d3d3325bdd SHA512 fc75f0e956d59b3231440882242a1c9ef59f3e694c3c0ed16673cdb99aa92b58d94679d6b3385c373e8aa7bbf7b1ced73ed50ca26be76ebf54a72341c284bdbf
diff --git a/x11-misc/xnots/files/xnots-0.2.1-gcc6.patch b/x11-misc/xnots/files/xnots-0.2.1-gcc6.patch
index df65f009cdb7..e3d14000402f 100644
--- a/x11-misc/xnots/files/xnots-0.2.1-gcc6.patch
+++ b/x11-misc/xnots/files/xnots-0.2.1-gcc6.patch
@@ -1,5 +1,3 @@
-diff --git a/src/Makefile b/src/Makefile
-index 4f8aaf1..7b527a6 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -28,7 +28,7 @@ else
@@ -11,8 +9,6 @@ index 4f8aaf1..7b527a6 100644
  CFLAGS		+= -DVERSION=\"$(VERSION)\" -Wall
  CFLAGS		+= $(shell pkg-config $(PKGS) --cflags)
  LDLIBS		+= $(shell pkg-config $(PKGS) --libs)
-diff --git a/src/main.c b/src/main.c
-index aef54d6..f1571f3 100644
 --- a/src/main.c
 +++ b/src/main.c
 @@ -228,7 +228,6 @@ processOptions( int argc, char **argv )
@@ -32,8 +28,6 @@ index aef54d6..f1571f3 100644
  				    config_file);
  
      /* Initialize  the global xnots_t structure. */
-diff --git a/src/xnots.h b/src/xnots.h
-index 52316fe..6b9f577 100644
 --- a/src/xnots.h
 +++ b/src/xnots.h
 @@ -330,6 +330,7 @@ void		correctNoteGeometry	( Note		*note,
diff --git a/x11-misc/xnots/xnots-0.2.1-r1.ebuild b/x11-misc/xnots/xnots-0.2.1-r1.ebuild
deleted file mode 100644
index f177612e4c75..000000000000
--- a/x11-misc/xnots/xnots-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A desktop sticky note program for the unix geek"
-HOMEPAGE="http://xnots.sourceforge.net https://github.com/thePalindrome/xnots"
-SRC_URI="mirror://sourceforge/xnots/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="vim-syntax"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/pango[X]
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	sed -i -e 's|LICENCE||g' Makefile || die
-
-	append-cflags -std=gnu89
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" NO_DEBUG=1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF} \
-		mandir=/usr/share/man \
-		prefix=/usr \
-		install
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins etc/xnots.vim
-	fi
-}
diff --git a/x11-misc/xnots/xnots-0.2.1-r2.ebuild b/x11-misc/xnots/xnots-0.2.1-r2.ebuild
index c92abc690cd7..4037d3a8f0b6 100644
--- a/x11-misc/xnots/xnots-0.2.1-r2.ebuild
+++ b/x11-misc/xnots/xnots-0.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/xnots/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="vim-syntax"
 
 RDEPEND="