gentoo resync : 03.03.2021

6 files changed, 77 insertions, 409 deletions

diff --git a/x11-misc/dzen/Manifest b/x11-misc/dzen/Manifest
index 614fd65c2a97..c495fab552d4 100644
--- a/x11-misc/dzen/Manifest
+++ b/x11-misc/dzen/Manifest
@@ -1,9 +1,7 @@
 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
-AUX dzen-0.9.5_p1-gentoo.patch 8159 BLAKE2B 1dde32a7522894bf5bf947651c7a0a1f64db40d1e4e439182dcc0982af21a7620c38fc8149aa9bb607ae7821acf094d7e2ed8b2547efcc389c234d4c6dcf3f36 SHA512 8c6eb3c45c12f095a41b1847967dfe42ddd1fd7572e48aef5673a548b7186f0ad4ea08c662e08a632c5bcb1e191f381f4ae57fc293920f77e541bbdc294f974c
-AUX dzen-0.9.5_p1-unused-but-set.patch 2024 BLAKE2B 6dbcb15ac1e62f34a54f96a0a39117b88c71944c6157ec44384aeddbb9e6bd6010b4b8504929e57c77f3911e5f1857bb323223b273ccb3a1461f4c501a470da9 SHA512 c5200e9d4a3519d9cf1439c6f171335c2eceacb3691e08bbcffc4431b420a1c5bfb1036ffffaf9b3307c5b940d546b2549e8fce42dd157d7b9d37920631e57a2
 DIST dzen-0.9.5.tar.gz 38167 BLAKE2B 92297cceca2215d812aa4536bd7421ab992a372667ca832de70a2bf43faea4b5e7beb147a454d7ced5be4e53085f4eaf15d752888ee019d799cd3bb8fcbdb6ba SHA512 ed4eb5d657d8f3822d8fbf224da5c2d415852c340959840051ec9cfc63f90361e09b9d36cb8221cf046ae66af02b9fab67f4f16c834c5895e801d452e4f8a916
-DIST dzen-0.9.5_p1.tar.gz 38178 BLAKE2B 9ec81747d6eec9b7cca58b11096e00548cdca7ba21a179599979cf9b22ff84100d266d98e7a3e419960a56fee788ae96158650884a1b1322def6a98a70d6683b SHA512 239acfcacbc871ded5755ee0d5cca3185fcd93142bcf81552974f2ffc19d9f5ebdc02956108931f58b35c68ac57ec6e748bdb9cdbf7791ec6e224ef270bda300
+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_p1.ebuild 1465 BLAKE2B 7a1b4332f1001bfb4a01cd7f431a3d5a95214b3f3c5366a12aec84c7e6cd6a4e247fc526837bb8beee5430e3ff9def819cd79c6bcfa457c5b93ab097183cd236 SHA512 d634a77533d3a9c1517b11f0497d5b7a13b91a6e625a972e4f1cc593785f2ef81f5de11fe39313b24eba784a8b922551b34c382bb6510c0a858a0b44b3edf1a1
-MISC metadata.xml 642 BLAKE2B 28355993f6f8edc43e8af4717523ae4dc0b249f88ee5a85bc20e23d4942084dfc29d43a71c9163f2a3bfa4555dca5648bd7682429527124502be4f2eef10288d SHA512 3f7b850582bdc314f4bbf795a3171f27ac8e9c41eeb56221106cb70f039ce37e62b43b2a09c21862cb6efe50e22ddfa45b711c809ba8347c52010188c2207e81
+EBUILD dzen-0.9.5_p2.ebuild 1565 BLAKE2B ed3b0a8e0e9934437d97dda7f518d9556ae81f18e2fb2ff743cd867aeb33689fbea98bf7e5f4dda77fc671093ddf1882b1b064171dd654a76965ed00e5e8974e SHA512 474536e097bb7d03e70eaa709b798bb6deb36035a0361fbf903248f7b6a6fe02dd871575d24a7be1a9efee03dca4f28436b9e66622a1e2e71db25817d08406c2
+MISC metadata.xml 438 BLAKE2B f10ab9d9e7e3fd4009c0fc7c7daaf3b08fd0cbf4c53e463d4acf7a401a911dfebec71d62dd985b99a19d9123f9c60bb7338b170c8493cfc71e6fb943fbb415d5 SHA512 7698619d1e49251e7d82e6489e858c5543828a87d5439d3cfc6cb190ceb5754adfc4602a179fe63a2fe96a913887418f3987b52895132b9d78ec61fbadc72330
diff --git a/x11-misc/dzen/dzen-0.9.5_p1.ebuild b/x11-misc/dzen/dzen-0.9.5_p1.ebuild
deleted file mode 100644
index f8b22d1c4b8d..000000000000
--- a/x11-misc/dzen/dzen-0.9.5_p1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-COMMITID="488ab66019f475e35e067646621827c18a879ba1"
-
-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
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-unused-but-set.patch
-)
-DOCS=( README )
-S=${WORKDIR}/robm-${PN}-${COMMITID:0:7}
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-
-	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
new file mode 100644
index 000000000000..b2dadc4502d7
--- /dev/null
+++ b/x11-misc/dzen/dzen-0.9.5_p2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+COMMIT_HASH="488ab66019f475e35e067646621827c18a879ba1"
+
+DESCRIPTION="General purpose messaging, notification, and menu utility"
+HOMEPAGE="https://github.com/robm/dzen"
+SRC_URI="https://github.com/robm/dzen/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="2"
+IUSE="xinerama xpm"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXft
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -i '/strip/d; /@echo/d; s/\t@/\t/; s/-L.*/$(X11LIBS)/' \
+		Makefile gadgets/Makefile || die
+}
+
+src_compile() {
+	local cflags="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags x11)"
+	local libs="$($(tc-getPKG_CONFIG) --libs x11)"
+
+	emake -C gadgets \
+		CC="$(tc-getCC)" CFLAGS="${cflags}" \
+		LDFLAGS="${LDFLAGS}" X11LIBS="${libs}"
+
+	local flag
+	# xft always-enabled wrt bug #477656
+	for flag in xft $(usev xinerama) $(usev xpm); do
+		cflags+=" $($(tc-getPKG_CONFIG) --cflags ${flag}) -DDZEN_${flag^^}"
+		libs+=" $($(tc-getPKG_CONFIG) --libs ${flag})"
+	done
+
+	cflags+=" -DVERSION='\"$(ver_cut 1-3)\"'"
+
+	emake CC="$(tc-getCC)" CFLAGS="${cflags}" LIBS="${LDFLAGS} ${libs}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C gadgets install
+	dobin gadgets/*.sh
+	dodoc gadgets/README*
+	einstalldocs
+}
diff --git a/x11-misc/dzen/files/dzen-0.9.5_p1-gentoo.patch b/x11-misc/dzen/files/dzen-0.9.5_p1-gentoo.patch
deleted file mode 100644
index 9ac204e6b28e..000000000000
--- a/x11-misc/dzen/files/dzen-0.9.5_p1-gentoo.patch
+++ /dev/null
@@ -1,252 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -12,45 +12,44 @@
- 	@echo dzen2 build options:
- 	@echo "CFLAGS   = ${CFLAGS}"
- 	@echo "LDFLAGS  = ${LDFLAGS}"
--	@echo "CC       = ${CC}"
-+	@echo "CC       = $(CC)"
- 	@echo "LD       = ${LD}"
- 
- .c.o:
- 	@echo CC $<
--	@${CC} -c ${CFLAGS} $<
-+	$(CC) -c ${CFLAGS} $<
- 
- ${OBJ}: dzen.h action.h config.mk
- 
- dzen2: ${OBJ}
- 	@echo LD $@
--	@${LD} -o $@ ${OBJ} ${LDFLAGS}
--	@strip $@
-+	${LD} -o $@ ${OBJ} ${LDFLAGS}
- 	@echo "Run ./help for documentation"
- 
- clean:
- 	@echo cleaning
--	@rm -f dzen2 ${OBJ} dzen2-${VERSION}.tar.gz
-+	rm -f dzen2 ${OBJ} dzen2-${VERSION}.tar.gz
- 
- dist: clean
- 	@echo creating dist tarball
--	@mkdir -p dzen2-${VERSION}
--	@mkdir -p dzen2-${VERSION}/gadgets
--	@mkdir -p dzen2-${VERSION}/bitmaps
--	@cp -R CREDITS LICENSE Makefile INSTALL README.dzen README help config.mk action.h dzen.h ${SRC} dzen2-${VERSION}
--	@cp -R gadgets/Makefile  gadgets/config.mk gadgets/README.dbar gadgets/textwidth.c gadgets/README.textwidth gadgets/dbar.c gadgets/gdbar.c gadgets/README.gdbar gadgets/gcpubar.c gadgets/README.gcpubar gadgets/kittscanner.sh gadgets/README.kittscanner gadgets/noisyalert.sh dzen2-${VERSION}/gadgets
--	@cp -R bitmaps/alert.xbm bitmaps/ball.xbm bitmaps/battery.xbm bitmaps/envelope.xbm bitmaps/volume.xbm bitmaps/pause.xbm bitmaps/play.xbm bitmaps/music.xbm  dzen2-${VERSION}/bitmaps
--	@tar -cf dzen2-${VERSION}.tar dzen2-${VERSION}
--	@gzip dzen2-${VERSION}.tar
--	@rm -rf dzen2-${VERSION}
-+	mkdir -p dzen2-${VERSION}
-+	mkdir -p dzen2-${VERSION}/gadgets
-+	mkdir -p dzen2-${VERSION}/bitmaps
-+	cp -R CREDITS LICENSE Makefile INSTALL README.dzen README help config.mk action.h dzen.h ${SRC} dzen2-${VERSION}
-+	cp -R gadgets/Makefile  gadgets/config.mk gadgets/README.dbar gadgets/textwidth.c gadgets/README.textwidth gadgets/dbar.c gadgets/gdbar.c gadgets/README.gdbar gadgets/gcpubar.c gadgets/README.gcpubar gadgets/kittscanner.sh gadgets/README.kittscanner gadgets/noisyalert.sh dzen2-${VERSION}/gadgets
-+	cp -R bitmaps/alert.xbm bitmaps/ball.xbm bitmaps/battery.xbm bitmaps/envelope.xbm bitmaps/volume.xbm bitmaps/pause.xbm bitmaps/play.xbm bitmaps/music.xbm  dzen2-${VERSION}/bitmaps
-+	tar -cf dzen2-${VERSION}.tar dzen2-${VERSION}
-+	gzip dzen2-${VERSION}.tar
-+	rm -rf dzen2-${VERSION}
- 
- install: all
- 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f dzen2 ${DESTDIR}${PREFIX}/bin
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/dzen2
-+	mkdir -p ${DESTDIR}${PREFIX}/bin
-+	cp -f dzen2 ${DESTDIR}${PREFIX}/bin
-+	chmod 755 ${DESTDIR}${PREFIX}/bin/dzen2
- 
- uninstall:
- 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
--	@rm -f ${DESTDIR}${PREFIX}/bin/dzen2
-+	rm -f ${DESTDIR}${PREFIX}/bin/dzen2
- 
- .PHONY: all options clean dist install uninstall
---- 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
-@@ -18,61 +18,12 @@
- # Uncomment: Remove # from the beginning of respective lines
- # 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 XFT
--#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama `pkg-config --libs xft`
--#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XFT `pkg-config --cflags xft`
--
--
--## Option 8: 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/Makefile
-+++ b/gadgets/Makefile
-@@ -12,61 +12,57 @@
- 	@echo dzen2 gadgets build options:
- 	@echo "CFLAGS   = ${CFLAGS}"
- 	@echo "LDFLAGS  = ${LDFLAGS}"
--	@echo "CC       = ${CC}"
-+	@echo "CC       = $(CC)"
- 	@echo "LD       = ${LD}"
- 
- .c.o:
- 	@echo CC $<
--	@${CC} -c ${CFLAGS} $<
-+	$(CC) -c ${CFLAGS} $<
- 
- ${OBJ}: dbar.h config.mk
- 
- dbar: ${OBJ}
- 	@echo LD $@
--	@${LD} -o $@ dbar-main.o dbar.o ${LDFLAGS}
--	@strip $@
-+	${LD} -o $@ dbar-main.o dbar.o ${LDFLAGS}
- 
- gdbar: ${OBJ}
- 	@echo LD $@
- #	@${LD} -o $@ gdbar.o dbar.o ${LDFLAGS} -L${X11LIB} -lX11
--	@${LD} -o $@ gdbar.o dbar.o ${LDFLAGS}
--	@strip $@
-+	${LD} -o $@ gdbar.o dbar.o ${LDFLAGS}
- 
- gcpubar: ${OBJ}
- 	@echo LD $@
- #	@${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS} -L${X11LIB}
--	@${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS}
--	@strip $@
-+	${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS}
- 
- textwidth: ${OBJ}
- 	@echo LD $@
--	@${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
--	@strip $@
-+	${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
- 
- clean:
- 	@echo cleaning
--	@rm -f ${OBJ} dbar
--	@rm -f ${OBJ} gdbar
--	@rm -f ${OBJ} gcpubar
--	@rm -f ${OBJ} textwidth
-+	rm -f ${OBJ} dbar
-+	rm -f ${OBJ} gdbar
-+	rm -f ${OBJ} gcpubar
-+	rm -f ${OBJ} textwidth
- 
- install: all
- 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
--	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f dbar ${DESTDIR}${PREFIX}/bin
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/dbar
--	@cp -f gdbar ${DESTDIR}${PREFIX}/bin
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/gdbar
--	@cp -f gcpubar ${DESTDIR}${PREFIX}/bin
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/gcpubar
--	@cp -f textwidth ${DESTDIR}${PREFIX}/bin
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/textwidth
-+	mkdir -p ${DESTDIR}${PREFIX}/bin
-+	cp -f dbar ${DESTDIR}${PREFIX}/bin
-+	chmod 755 ${DESTDIR}${PREFIX}/bin/dbar
-+	cp -f gdbar ${DESTDIR}${PREFIX}/bin
-+	chmod 755 ${DESTDIR}${PREFIX}/bin/gdbar
-+	cp -f gcpubar ${DESTDIR}${PREFIX}/bin
-+	chmod 755 ${DESTDIR}${PREFIX}/bin/gcpubar
-+	cp -f textwidth ${DESTDIR}${PREFIX}/bin
-+	chmod 755 ${DESTDIR}${PREFIX}/bin/textwidth
- 
- uninstall:
- 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
--	@rm -f ${DESTDIR}${PREFIX}/bin/dbar
--	@rm -f ${DESTDIR}${PREFIX}/bin/gdbar
--	@rm -f ${DESTDIR}${PREFIX}/bin/gcpubar
--	@rm -f ${DESTDIR}${PREFIX}/bin/textwidth
-+	rm -f ${DESTDIR}${PREFIX}/bin/dbar
-+	rm -f ${DESTDIR}${PREFIX}/bin/gdbar
-+	rm -f ${DESTDIR}${PREFIX}/bin/gcpubar
-+	rm -f ${DESTDIR}${PREFIX}/bin/textwidth
- 
- .PHONY: all options clean install uninstall
---- 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}
diff --git a/x11-misc/dzen/files/dzen-0.9.5_p1-unused-but-set.patch b/x11-misc/dzen/files/dzen-0.9.5_p1-unused-but-set.patch
deleted file mode 100644
index 70116ff66d2b..000000000000
--- a/x11-misc/dzen/files/dzen-0.9.5_p1-unused-but-set.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -293,7 +293,6 @@
- static void
- set_docking_ewmh_info(Display *dpy, Window w, int dock) {
- 	unsigned long strut[12] = { 0 };
--	unsigned long strut_s[4] = { 0 };
- 	XWindowAttributes wa;
- 	Atom type;
- 	unsigned int desktop;
-@@ -339,8 +338,6 @@
- 		strut[2] = si.y + wa.height;
- 		strut[8] = wa.x;
- 		strut[9] = wa.x + wa.width - 1;
--
--		strut_s[2] = strut[2];
- 	}
- 	else if((wa.y - si.y + wa.height) == si.height) {
- #ifdef DZEN_XINERAMA
-@@ -358,8 +355,6 @@
- #endif
- 		strut[10] = wa.x;
- 		strut[11] = wa.x + wa.width - 1;
--
--		strut_s[3] = strut[3];
- 	}
- 
- 	if(strut[2] != 0 || strut[3] != 0) {
-@@ -832,11 +827,9 @@
- 		XFreeStringList(missing);
- 
- 	if(dzen.fnpl[p].set) {
--		XFontSetExtents *font_extents;
- 		XFontStruct **xfonts;
- 		char **font_names;
- 		dzen.fnpl[p].ascent = dzen.fnpl[p].descent = 0;
--		font_extents = XExtentsOfFontSet(dzen.fnpl[p].set);
- 		n = XFontsOfFontSet(dzen.fnpl[p].set, &xfonts, &font_names);
- 		for(i = 0, dzen.fnpl[p].ascent = 0, dzen.fnpl[p].descent = 0; i < n; i++) {
- 			if(dzen.fnpl[p].ascent < (*xfonts)->ascent)
---- a/gadgets/textwidth.c
-+++ b/gadgets/textwidth.c
-@@ -62,11 +62,9 @@
- 	if(missing)
- 		XFreeStringList(missing);
- 	if(font.set) {
--		XFontSetExtents *font_extents;
- 		XFontStruct **xfonts;
- 		char **font_names;
- 		font.ascent = font.descent = 0;
--		font_extents = XExtentsOfFontSet(font.set);
- 		n = XFontsOfFontSet(font.set, &xfonts, &font_names);
- 		for(i = 0, font.ascent = 0, font.descent = 0; i < n; i++) {
- 			if(font.ascent < (*xfonts)->ascent)
---- a/gadgets/gcpubar.c
-+++ b/gadgets/gcpubar.c
-@@ -40,7 +40,6 @@
- 
- int main(int argc, char *argv[]) {
- 	int i, t;
--	double total;
- 	struct cpu_info mcpu;
- 	FILE *statfp;
- 	char buf[256], *ep;
-@@ -149,7 +148,6 @@
- 		while(fgets(buf, sizeof buf, statfp)) {
- 			if(!strncmp(buf, "cpu ", 4)) {
- 				unsigned long long unice;
--				double myload;
- 				/* linux >= 2.6 */
- 				if((sscanf(buf, "cpu %llu %llu %llu %llu %llu", 
- 								&ncpu.user, &unice, &ncpu.sys, &ncpu.idle, &ncpu.iowait)) < 5) {
diff --git a/x11-misc/dzen/metadata.xml b/x11-misc/dzen/metadata.xml
index 3319f73334bb..d2e640d185c3 100644
--- a/x11-misc/dzen/metadata.xml
+++ b/x11-misc/dzen/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
-  <longdescription>Dzen is a general purpose messaging, notification and menuing
-  program for X11. It was designed to be scriptable in any language and
-  integrate well with window managers like dwm, wmii and xmonad though it will
-  work with any window manager.</longdescription>
-  <upstream>
-    <remote-id type="github">robm/dzen</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>sudinave@gmail.com</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">robm/dzen</remote-id>
+	</upstream>
 </pkgmetadata>