gentoo resync : 28.04.2021

5 files changed, 2 insertions, 189 deletions

diff --git a/x11-misc/dzen/Manifest b/x11-misc/dzen/Manifest
index 33bdf44afa36..08a50bcc0ac6 100644
--- a/x11-misc/dzen/Manifest
+++ b/x11-misc/dzen/Manifest
@@ -1,7 +1,3 @@
-AUX dzen-0.9.5-config-default.patch 2649 BLAKE2B 1069b1d94482fd471387ceca9c727eaf65f9ecde401015a114e73498874d7d04e3c4ec2e7062e245bcfd26a2feb8db5d4b39e072e64899eedca34d3033813102 SHA512 4884455ff03197d718e5700106b4b5250343a69b11cdd6190580f89e70306d97a1dde8154baabc79a909ed571806a992fa643d7380830257331bec477e46c54d
-AUX dzen-0.9.5-off-by-one.patch 188 BLAKE2B edd3b393c3b4cfb3091cc7fe3ca156b06fd178e53a24ec08967765c90d60005415109f9c85e67680f735c037abe4150cf162b184bbd47f108ac37b26ec2618c8 SHA512 1a82875ee296af37d559b14da4cadef40f2cd6842d67cf6d761d0c65acd1bdb51b0d8096282f1172f109178ecd3f3c1debef809373a0e6ab04fb161d57e20f8d
-DIST dzen-0.9.5.tar.gz 38167 BLAKE2B 92297cceca2215d812aa4536bd7421ab992a372667ca832de70a2bf43faea4b5e7beb147a454d7ced5be4e53085f4eaf15d752888ee019d799cd3bb8fcbdb6ba SHA512 ed4eb5d657d8f3822d8fbf224da5c2d415852c340959840051ec9cfc63f90361e09b9d36cb8221cf046ae66af02b9fab67f4f16c834c5895e801d452e4f8a916
 DIST dzen-0.9.5_p2.tar.gz 38181 BLAKE2B 0e34228c3795864a1b6ac5a3ac9d0ab4a1b90e065a649caa34d704951007bb1239db920f7ed3e35303f614c6572b6232768d59302b23edab0c11793574fcde3d SHA512 e750ab9c62dad311bf478d79c15ffdc1ef108fe2c3ed5df82316d879aad000bee785d304048f5daae237468f6fe018f14fc05d0114d68d873f766dbf1dfebbc9
-EBUILD dzen-0.9.5-r1.ebuild 1578 BLAKE2B d67c414c9ecfa47316f9f8df899928f2c0c0cf5eaa34898b2445be7c1923bc74c7896425969b96ee13b173efce4653e04a11016a8b97cf11bb38ee584b097925 SHA512 e5f07cb9df6dd14af89441659de778470924cc4c681feaa176e9282a05f03186e0e7d14b7782d4fe2334471f19995658c80a11411240fa06a9d80f1a455a513c
-EBUILD dzen-0.9.5_p2.ebuild 1565 BLAKE2B ed3b0a8e0e9934437d97dda7f518d9556ae81f18e2fb2ff743cd867aeb33689fbea98bf7e5f4dda77fc671093ddf1882b1b064171dd654a76965ed00e5e8974e SHA512 474536e097bb7d03e70eaa709b798bb6deb36035a0361fbf903248f7b6a6fe02dd871575d24a7be1a9efee03dca4f28436b9e66622a1e2e71db25817d08406c2
+EBUILD dzen-0.9.5_p2.ebuild 1563 BLAKE2B b7818e434aa3f6862b46a62a8d83cdcc0c1605bfa964bd7a8eb6524147348a0c977b155b62f43ba309a36055a09060390b358802b6ad57b722316ba2cc28f8bf SHA512 93724d93fa434650cdc680f701896164cc107ebcd5dab76c07544d1446c207e60642babdcc5df0acd9901e5538325db2de68cf03513e8199d026e59f7cac2bca
 MISC metadata.xml 468 BLAKE2B 132771e69a56bf54111dccc98115c990cf86a5afeb0b7e58a7c57df2335c85d31f06cef1b8b9e82b79da7001333dec21f17a5288f81e8ddc8f29b61e4462f9ec SHA512 f2f15df231fb32da4fddc300da705241c88eb81ac61aa9c3d25765838f11f3484d6f1c4d6de8c2a9a77e0ec47b7a5aadf9a73cca1d480d7ece9853d5deb46e28
diff --git a/x11-misc/dzen/dzen-0.9.5-r1.ebuild b/x11-misc/dzen/dzen-0.9.5-r1.ebuild
deleted file mode 100644
index 9addccdf4bb7..000000000000
--- a/x11-misc/dzen/dzen-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs vcs-snapshot
-
-COMMITID="f7907da3a42a6d59e27ede88f5f01e4e41c4c9e0"
-
-DESCRIPTION="a general purpose messaging, notification and menuing program for X11"
-HOMEPAGE="https://github.com/robm/dzen"
-SRC_URI="https://github.com/robm/${PN}/tarball/${COMMITID} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-IUSE="minimal xft xinerama xpm"
-SLOT="2"
-
-RDEPEND="
-	x11-libs/libX11
-	xft? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-	xpm? ( x11-libs/libXpm )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-DOCS=( README )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-config-default.patch \
-		"${FILESDIR}"/${P}-off-by-one.patch
-
-	sed -i \
-		-e '/strip/d' \
-		-e 's:^	@:	:g' \
-		-e 's:{CC}:(CC):g' \
-		Makefile gadgets/Makefile || die
-
-	tc-export CC PKG_CONFIG
-}
-
-src_configure() {
-	if use xinerama ; then
-		sed -e '/^LIBS/s|$| -lXinerama|' \
-			-e '/^CFLAGS/s|$| -DDZEN_XINERAMA|' \
-			-i config.mk || die
-	fi
-	if use xpm ; then
-		sed -e '/^LIBS/s|$| -lXpm|' \
-			-e '/^CFLAGS/s|$| -DDZEN_XPM|' \
-			-i config.mk || die
-	fi
-	if use xft ; then
-		sed -e '/^LIBS/s|$| $(shell ${PKG_CONFIG} --libs xft)|' \
-			-e '/^CFLAGS/s|$| -DDZEN_XFT $(shell ${PKG_CONFIG} --cflags xft)|' \
-			-i config.mk || die
-	fi
-}
-
-src_compile() {
-	default
-	use minimal || emake -C gadgets
-}
-
-src_install() {
-	default
-
-	if ! use minimal ; then
-		emake -C gadgets DESTDIR="${D}" install
-		dobin gadgets/*.sh
-		dodoc gadgets/README*
-	fi
-}
diff --git a/x11-misc/dzen/dzen-0.9.5_p2.ebuild b/x11-misc/dzen/dzen-0.9.5_p2.ebuild
index b2dadc4502d7..547c24c755b8 100644
--- a/x11-misc/dzen/dzen-0.9.5_p2.ebuild
+++ b/x11-misc/dzen/dzen-0.9.5_p2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/robm/dzen/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.
 S="${WORKDIR}/${PN}-${COMMIT_HASH}"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="2"
 IUSE="xinerama xpm"
 
diff --git a/x11-misc/dzen/files/dzen-0.9.5-config-default.patch b/x11-misc/dzen/files/dzen-0.9.5-config-default.patch
deleted file mode 100644
index 2fcdddbf6a68..000000000000
--- a/x11-misc/dzen/files/dzen-0.9.5-config-default.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/config.mk
-+++ b/config.mk
-@@ -4,7 +4,7 @@
- # Customize below to fit your system
- 
- # paths
--PREFIX = /usr/local
-+PREFIX = /usr
- MANPREFIX = ${PREFIX}/share/man
- 
- X11INC = /usr/X11R6/include
-@@ -19,55 +19,12 @@
- # Comment  : Add # to the beginning of the respective lines
- 
- ## Option 1: No Xinerama no XPM no XFT
--#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
--#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\"
--
--
--## Option 2: No Xinerama with XPM
--#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm
--#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM
--
--
--# Option 3: With Xinerama no XPM
--#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama
--#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA
--
--
--## Option 4: With Xinerama and XPM
--#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm
--#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
--
--
--## Option 5: With XFT
--LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs xft`
--CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XFT `pkg-config --cflags xft`
--
--
--## Option 6: With XPM and XFT
--#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm `pkg-config --libs xft`
--#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`
--
--
--## Option 7: With Xinerama and XPM and XFT
--#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft`
--#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`
--
--
-+LIBS = -lX11
-+CFLAGS += -Wall ${INCS} -DVERSION=\"${VERSION}\"
- 
- # END of feature configuration
- 
--
--LDFLAGS = ${LIBS}
--
--# Solaris, uncomment for Solaris
--#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
--#LDFLAGS = ${LIBS}
--#CFLAGS += -xtarget=ultra
--
--# Debugging
--#CFLAGS = ${INCS} -DVERSION=\"${VERSION}\" -std=gnu89 -pedantic -Wall -W -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wdisabled-optimization -O2 -pipe -DDZEN_XFT `pkg-config --cflags xft`
--#LDFLAGS = ${LIBS}
-+LDFLAGS += ${LIBS}
- 
- # compiler and linker
--CC = gcc
--LD = ${CC}
-+LD = $(CC)
---- a/gadgets/config.mk
-+++ b/gadgets/config.mk
-@@ -1,7 +1,7 @@
- # Customize below to fit your system
- 
- # paths
--PREFIX = /usr/local
-+PREFIX = /usr
- MANPREFIX = ${PREFIX}/share/man
- 
- X11INC = /usr/X11R6/include
-@@ -10,9 +10,8 @@
- X11LIB = /usr/X11R6/lib
- LIBS = -L/usr/lib 
- 
--CFLAGS = -Os ${INCS} 
--LDFLAGS = ${LIBS}
-+CFLAGS += ${INCS} 
-+LDFLAGS += ${LIBS}
- 
- # compiler and linker
--CC = gcc
--LD = ${CC}
-+LD = $(CC)
diff --git a/x11-misc/dzen/files/dzen-0.9.5-off-by-one.patch b/x11-misc/dzen/files/dzen-0.9.5-off-by-one.patch
deleted file mode 100644
index 008fd6455014..000000000000
--- a/x11-misc/dzen/files/dzen-0.9.5-off-by-one.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -109,7 +109,7 @@
- 		rem = NULL;
- 	}
- 	while(off < len) {
--		if(i > MAX_LINE_LEN) {
-+		if(i == MAX_LINE_LEN - 1) {
- 			outbuf[i] = '\0';
- 			return ++off;
- 		}