[gentoo-commits] repo/gentoo:master commit in: x11-misc/dzen/, x11-misc/dzen/files/

[Andreas Sturmlechner]

commit:     1d74cf370dd7ee26b2c073cd1c36eb9c41bfc07e
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Sat Mar 27 16:25:55 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 09:06:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d74cf37

x11-misc/dzen: drop 0.9.5-r1

Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-misc/dzen/Manifest                             |  1 -
 x11-misc/dzen/dzen-0.9.5-r1.ebuild                 | 77 ------------------
 .../dzen/files/dzen-0.9.5-config-default.patch     | 95 ----------------------
 x11-misc/dzen/files/dzen-0.9.5-off-by-one.patch    | 11 ---
 4 files changed, 184 deletions(-)

diff --git a/x11-misc/dzen/Manifest b/x11-misc/dzen/Manifest
index a2c5084c6e3..40b595bf9e6 100644
--- a/x11-misc/dzen/Manifest
+++ b/x11-misc/dzen/Manifest
@@ -1,2 +1 @@
-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

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 9addccdf4bb..00000000000
--- 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/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 2fcdddbf6a6..00000000000
--- 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 008fd645501..00000000000
--- 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;
- 		}