[gentoo-commits] repo/gentoo:master commit in: x11-wm/blackbox/, x11-wm/blackbox/files/

[Ben Kohler]

commit:     b6da5fa30434e4d695aba280ae0b25ed2060b94d
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 18:48:43 2020 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 18:50:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6da5fa3

x11-wm/blackbox: drop old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 x11-wm/blackbox/Manifest                           |   2 -
 x11-wm/blackbox/blackbox-0.70.1-r1.ebuild          |  56 -----------
 x11-wm/blackbox/blackbox-0.75.ebuild               |  52 ----------
 .../blackbox/files/blackbox-0.70.1-asneeded.patch  |  49 ----------
 .../blackbox/files/blackbox-0.70.1-gcc-4.3.patch   | 106 ---------------------
 .../files/blackbox-0.70.1-no-LDFLAGS-pc.patch      |  14 ---
 6 files changed, 279 deletions(-)

diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index 1c2d7b0dfad..952b6ae64ab 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -1,3 +1 @@
-DIST blackbox-0.70.1.tar.bz2 492399 BLAKE2B d6faed388d2a1fbfbf10baf2b848f78fc5d99bc4e5fb2daf28df7ec9732d9ad5de9dfa87763cea9a954ed72b23207563dda65c92bb37ba2136e8f6e6049e0ab7 SHA512 6e8cf6fd04030a5f97ffd8dbe97aaa0f683f776e7237cdd46f2b93265cd8de665cffce5a352624a2235aa6c42628be13f98d565af765b3f06e95bff404fb0ccb
-DIST blackbox-0.75.tar.gz 394605 BLAKE2B 6e1338f946fe1d211d88f060178a17c452ca2b5f700d8ab73c62e2f01fd7bc81a52d06dcb42941c133528b144a6707c6ecc4711cb10630ce2921214d0b699669 SHA512 64d1ec45f9cb143dc5e3688a490acb3e20e303c57f778656dda227215b2fa13ca2db753aebc7b1ea9605a9d66c69ff8cfdf8010dc2f37ddc4609d9d3865ec068
 DIST blackbox-0.76.tar.gz 394032 BLAKE2B ffefd24277c581ca59216f53c10d5ffacd7231b33c7fd8bfd799a1f93f0b4953ab91f6c8e7061f91ca80036a8a2b8d7b118383e97b8ab58b8f4cd039155760a1 SHA512 bc97ae699820f8291399ce6f2a87ef4486fabcaeda2dc33fbeb31fc6405c01d722a52c85d8dc65ef44bb031e3dda63c326b76aa1bfca3e544bfcab0fac9d1afa

diff --git a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
deleted file mode 100644
index 967d5117112..00000000000
--- a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils ltprune
-
-DESCRIPTION="A small, fast, full-featured window manager for X"
-HOMEPAGE="https://github.com/bbidulock/blackboxwm"
-SRC_URI="mirror://sourceforge/${PN}wm/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="nls truetype debug"
-
-RDEPEND="x11-libs/libXft
-	x11-libs/libXt
-	nls? ( sys-devel/gettext )
-	truetype? ( media-libs/freetype )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch \
-		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-no-LDFLAGS-pc.patch
-
-	sed -i -e "s/_XUTIL_H_/_X11&/" lib/Util.hh || die #348556
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/X11/${PN} \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable truetype xft)
-}
-
-src_install() {
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/blackbox" > "${D}/etc/X11/Sessions/${PN}"
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog* COMPLIANCE README* TODO
-
-	prune_libtool_files --all
-}

diff --git a/x11-wm/blackbox/blackbox-0.75.ebuild b/x11-wm/blackbox/blackbox-0.75.ebuild
deleted file mode 100644
index fdc90e086fc..00000000000
--- a/x11-wm/blackbox/blackbox-0.75.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A small, fast, full-featured window manager for X"
-HOMEPAGE="https://github.com/bbidulock/blackboxwm"
-SRC_URI="https://github.com/bbidulock/blackboxwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="nls truetype debug"
-
-RDEPEND="x11-libs/libXft
-	x11-libs/libXt
-	nls? ( >=sys-devel/gettext-0.20 )
-	truetype? ( media-libs/freetype )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"/blackboxwm-${PV}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/X11/${PN} \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable truetype xft)
-}
-
-src_install() {
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/blackbox" > "${D}/etc/X11/Sessions/${PN}"
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog* COMPLIANCE README* TODO
-
-	find "${D}" -name '*.la' -delete || die
-}

diff --git a/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch b/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch
deleted file mode 100644
index a6b1e22e62b..00000000000
--- a/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Fixing build with as-needed. Enabling shared libs.
-
-http://bugs.gentoo.org/show_bug.cgi?id=248549
- 
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -22,7 +22,7 @@
- 
- DEFAULT_MENU		= $(pkgdatadir)/menu
- DEFAULT_STYLE		= $(pkgdatadir)/styles/Gray
--CPPFLAGS		= @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
-+AM_CPPFLAGS		= @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
- 			  -DLOCALEPATH=\"$(pkgdatadir)/nls\" \
- 			  -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
- 			  -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
---- lib/Makefile.am
-+++ lib/Makefile.am
-@@ -62,7 +62,8 @@
- 			Util.hh						\
- 			XDG.hh
- 
--libbt_la_LIBADD =	@ICONV@ @LOCALE@
-+libbt_la_LIBADD =	@ICONV@ @LOCALE@ @xft_LIBS@
-+libbt_la_CFLAGS = 	@xft_CFLAGS@
- 
- pkgconfigdir = 		$(libdir)/pkgconfig
- nodist_pkgconfig_DATA =	libbt.pc
---- util/Makefile.am
-+++ util/Makefile.am
-@@ -21,7 +21,7 @@
- # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
- # DEALINGS IN THE SOFTWARE.
- 
--CPPFLAGS		= @CPPFLAGS@ @DEBUG@ @NLS@ \
-+AM_CPPFLAGS		= @DEBUG@ @NLS@ \
- 			  -I$(top_srcdir)/lib
- 
- bin_SCRIPTS		= bsetbg
---- configure.ac
-+++ configure.ac
-@@ -29,7 +29,7 @@
- AC_PROG_INSTALL
- 
- dnl libbt shouldn't be shared by default (yet)
--AC_DISABLE_SHARED
-+dnl AC_DISABLE_SHARED
- AC_PROG_LIBTOOL
- AC_SUBST(LIBTOOL_DEPS)
- 

diff --git a/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch b/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch
deleted file mode 100644
index 1026bd5c80e..00000000000
--- a/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -Naupr blackbox-0.70.1.orig/lib/Image.cc blackbox-0.70.1/lib/Image.cc
---- blackbox-0.70.1.orig/lib/Image.cc	2005-04-08 17:41:09.000000000 +0200
-+++ blackbox-0.70.1/lib/Image.cc	2008-02-24 08:31:28.000000000 +0100
-@@ -42,8 +42,9 @@
- 
- #include <assert.h>
- #include <math.h>
--#include <stdio.h>
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
- 
- // #define COLORTABLE_DEBUG
- // #define MITSHM_DEBUG
-diff -Naupr blackbox-0.70.1.orig/lib/Resource.cc blackbox-0.70.1/lib/Resource.cc
---- blackbox-0.70.1.orig/lib/Resource.cc	2005-04-06 23:16:50.000000000 +0200
-+++ blackbox-0.70.1/lib/Resource.cc	2008-02-24 08:33:11.000000000 +0100
-@@ -28,7 +28,8 @@
- #include <X11/Xlib.h>
- #include <X11/Xresource.h>
- 
--#include <stdio.h>
-+#include <cstdio>
-+#include <cstring>
- 
- 
- bt::Resource::Resource(void)
-diff -Naupr blackbox-0.70.1.orig/lib/XDG.cc blackbox-0.70.1/lib/XDG.cc
---- blackbox-0.70.1.orig/lib/XDG.cc	2005-04-06 16:04:38.000000000 +0200
-+++ blackbox-0.70.1/lib/XDG.cc	2008-02-24 08:34:11.000000000 +0100
-@@ -25,7 +25,8 @@
- #include "Util.hh"
- #include "XDG.hh"
- 
--#include <stdlib.h>
-+#include <cstdlib>
-+#include <algorithm>
- 
- 
- // make sure directory names end with a slash
-diff -Naupr blackbox-0.70.1.orig/src/BlackboxResource.cc blackbox-0.70.1/src/BlackboxResource.cc
---- blackbox-0.70.1.orig/src/BlackboxResource.cc	2005-10-18 09:34:46.000000000 +0200
-+++ blackbox-0.70.1/src/BlackboxResource.cc	2008-02-24 08:34:49.000000000 +0100
-@@ -33,6 +33,8 @@
- #include <X11/Xutil.h>
- #include <X11/cursorfont.h>
- 
-+#include <cstring>
-+
- 
- BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
-   screen_resources = 0;
-diff -Naupr blackbox-0.70.1.orig/src/main.cc blackbox-0.70.1/src/main.cc
---- blackbox-0.70.1.orig/src/main.cc	2005-01-03 10:42:57.000000000 +0100
-+++ blackbox-0.70.1/src/main.cc	2008-02-24 08:37:16.000000000 +0100
-@@ -34,7 +34,8 @@
- #include "blackbox.hh"
- #include "../version.h"
- 
--#include <stdio.h>
-+#include <cstdio>
-+#include <cstring>
- 
- 
- static void showHelp(int exitval) {
-diff -Naupr blackbox-0.70.1.orig/src/Screen.cc blackbox-0.70.1/src/Screen.cc
---- blackbox-0.70.1.orig/src/Screen.cc	2005-10-18 10:07:22.000000000 +0200
-+++ blackbox-0.70.1/src/Screen.cc	2008-02-24 08:35:46.000000000 +0100
-@@ -45,8 +45,9 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <assert.h>
--#include <ctype.h>
- #include <dirent.h>
-+#include <cctype>
-+#include <cstring>
- 
- 
- static bool running = true;
-diff -Naupr blackbox-0.70.1.orig/src/ScreenResource.cc blackbox-0.70.1/src/ScreenResource.cc
---- blackbox-0.70.1.orig/src/ScreenResource.cc	2005-04-13 07:54:08.000000000 +0200
-+++ blackbox-0.70.1/src/ScreenResource.cc	2008-02-24 08:36:31.000000000 +0100
-@@ -33,6 +33,8 @@
- 
- #include <assert.h>
- 
-+#include <cstring>
-+
- 
- static const int iconify_width  = 9;
- static const int iconify_height = 9;
-diff -Naupr blackbox-0.70.1.orig/util/bsetroot.cc blackbox-0.70.1/util/bsetroot.cc
---- blackbox-0.70.1.orig/util/bsetroot.cc	2005-03-15 08:01:37.000000000 +0100
-+++ blackbox-0.70.1/util/bsetroot.cc	2008-02-24 08:38:41.000000000 +0100
-@@ -30,7 +30,9 @@
- #include <cctype>
- 
- #include <X11/Xatom.h>
--#include <stdio.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
- 
- 
- // ignore all X errors

diff --git a/x11-wm/blackbox/files/blackbox-0.70.1-no-LDFLAGS-pc.patch b/x11-wm/blackbox/files/blackbox-0.70.1-no-LDFLAGS-pc.patch
deleted file mode 100644
index e907b588b15..00000000000
--- a/x11-wm/blackbox/files/blackbox-0.70.1-no-LDFLAGS-pc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix LDFGAS leak to .pc file:
-> * QA Notice: pkg-config files with wrong LDFLAGS detected:
-> * /usr/lib64/pkgconfig/libbt.pc:Libs: -L${libdir} -lbt -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu -L/usr/lib -L/usr/local/lib 
-diff --git a/lib/libbt.pc.in b/lib/libbt.pc.in
-index a2a8869..8246cb0 100644
---- a/lib/libbt.pc.in
-+++ b/lib/libbt.pc.in
-@@ -7,5 +7,5 @@ Name: Blackbox Toolbox
- Description: Utility class library for writing small applications
- Requires: @XFT_PKGCONFIG@
- Version: @VERSION@
--Libs: -L${libdir} -lbt @LDFLAGS@ @ICONV@ @LOCALE@
-+Libs: -L${libdir} -lbt @ICONV@ @LOCALE@
- Cflags: -I${includedir}/bt