[gentoo-commits] repo/gentoo:master commit in: sys-apps/more/files/, profiles/, sys-apps/more/

[Michał Górny]

commit:     8fb66d5e5d3aa19a5bd6c698590751a2df5faec3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  3 22:04:31 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 22:12:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb66d5e

sys-apps/more: Remove last-rited pkg

 profiles/package.mask                        |  6 ---
 sys-apps/more/Manifest                       |  1 -
 sys-apps/more/files/more-2.12r-freebsd.patch | 65 ----------------------------
 sys-apps/more/metadata.xml                   |  5 ---
 sys-apps/more/more-2.12r.ebuild              | 61 --------------------------
 5 files changed, 138 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index b666b482fc2..4e325dc22c0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -277,12 +277,6 @@ xfce-extra/xfce4-volumed
 # Upstream is no longer providing public patches
 sys-kernel/hardened-sources
 
-# Mikle Kolyada <zlogene@g.o> (26 Aug 2017)
-# Masked for removal in 30 days.
-# No major keywords,  old EAPI, no maintainer.
-# Use sys-apps/less instead.
-sys-apps/more
-
 # Patrice Clement <monsieurp@g.o> (23 Aug 2017)
 # Packages depending on this library need to be tested first before
 # it is unmasked. Possibly some slotting is still needed.

diff --git a/sys-apps/more/Manifest b/sys-apps/more/Manifest
deleted file mode 100644
index a0a1f5697f0..00000000000
--- a/sys-apps/more/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST util-linux-2.12r.tar.bz2 1370907 SHA256 b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b SHA512 293a36cdc35efde631ff54fac68de8fc7cc28560c1ec54920caeecd6a6efa355e73b3d331cac4689ca66152e23bc5d737d38bc4ceb4ae39a611121c62b9c373b WHIRLPOOL 281b13265918c9466433a8abdf2b26acc3238360b7bb4a614bcde8500017c232efe499244181b01921939e06ebc2c2875d8e5c49741d0a180fda7205b6b03b72

diff --git a/sys-apps/more/files/more-2.12r-freebsd.patch b/sys-apps/more/files/more-2.12r-freebsd.patch
deleted file mode 100644
index 09a1ac60f71..00000000000
--- a/sys-apps/more/files/more-2.12r-freebsd.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -Nur util-linux-2.12r.orig/text-utils/Makefile util-linux-2.12r/text-utils/Makefile
---- util-linux-2.12r.orig/text-utils/Makefile	2007-06-14 13:37:07 -0600
-+++ util-linux-2.12r/text-utils/Makefile	2007-06-14 15:11:01 -0600
-@@ -30,13 +30,19 @@
- CFLAGS:=$(CFLAGS) -DPGNOBELL
- endif
- 
-+# On FreeBSD, we need to include libcompat (more uses re_comp & re_exec)
-+OS=$(shell uname)
-+ifeq "$(OS)" "FreeBSD"
-+  LIBCOMPAT=-lcompat
-+endif
-+
- all: $(BIN) $(USRBIN)
- 
- # more and pg and ul use curses - maybe we can't compile them
- ifeq "$(HAVE_NCURSES)" "yes"
- # Have ncurses - make more and pg and ul
- more pg ul:
--	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBCURSES)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBCURSES) $(LIBCOMPAT)
- more: more.o $(LIB)/xstrncpy.o
- pg: pg.o
- ul: ul.o
-diff -Nur util-linux-2.12r.orig/text-utils/more.c util-linux-2.12r/text-utils/more.c
---- util-linux-2.12r.orig/text-utils/more.c	2007-06-14 13:37:07 -0600
-+++ util-linux-2.12r/text-utils/more.c	2007-06-14 13:28:34 -0600
-@@ -63,6 +63,16 @@
- #include <regex.h>
- #undef _REGEX_RE_COMP
- 
-+/* Include limits.h on FreeBSD */
-+#ifdef __FreeBSD__
-+#include <limits.h>
-+#endif
-+
-+/* Define CBAUD for FreeBSD */
-+#ifndef CBAUD
-+#define CBAUD  0010017
-+#endif
-+
- #define VI		"vi"	/* found on the user's path */
- 
- #define Fopen(s,m)	(Currline = 0,file_pos=0,fopen(s,m))
-@@ -1560,7 +1570,7 @@
-     }
-     if (feof (file)) {
- 	if (!no_intty) {
--#ifndef __linux__
-+#if !defined(__linux__) && !defined(__FreeBSD__)
- 				/* No longer in libc 4.5.8. . . */
- 	    file->_flags &= ~STDIO_S_EOF_SEEN; /* why doesn't fseek do this ??!!??! */
- #endif
-@@ -1805,7 +1815,11 @@
-     tcgetattr(fileno(stderr), &otty);
-     savetty0 = otty;
-     slow_tty = (otty.c_cflag & CBAUD) < B1200;
-+#ifdef __FreeBSD__
-+    hardtabs = 1;
-+#else
-     hardtabs = (otty.c_oflag & TABDLY) != XTABS;
-+#endif
-     if (!no_tty) {
- 	otty.c_lflag &= ~(ICANON|ECHO);
- 	otty.c_cc[VMIN] = 1;

diff --git a/sys-apps/more/metadata.xml b/sys-apps/more/metadata.xml
deleted file mode 100644
index 6f49eba8f49..00000000000
--- a/sys-apps/more/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/sys-apps/more/more-2.12r.ebuild b/sys-apps/more/more-2.12r.ebuild
deleted file mode 100644
index 4eafdc7bb55..00000000000
--- a/sys-apps/more/more-2.12r.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Primitive text file viewer"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-SRC_URI="mirror://kernel/linux/utils/util-linux/util-linux-${PV}.tar.bz2"
-S=${WORKDIR}/util-linux-${PV}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
-IUSE="static nls selinux"
-
-RDEPEND="!static? ( >=sys-libs/ncurses-5.2-r2 )
-	selinux? ( sys-libs/libselinux )
-	!sys-apps/util-linux"
-DEPEND="${RDEPEND}
-	static? ( >=sys-libs/ncurses-5.2-r2[static-libs] )
-	nls? ( sys-devel/gettext )"
-
-yesno() { use $1 && echo yes || echo no; }
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-freebsd.patch
-
-	# Enable random features
-	local mconfigs="MCONFIG"
-	sed -i \
-		-e "/^HAVE_SELINUX=/s:no:$(yesno selinux):" \
-		-e "/^DISABLE_NLS=/s:no:$(yesno !nls):" \
-		-e "/^HAVE_KILL=/s:no:yes:" \
-		-e "/^HAVE_SLN=/s:no:yes:" \
-		-e "/^HAVE_TSORT/s:no:yes:" \
-		-e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
-		-e "s:CPU=.*:CPU=${CHOST%%-*}:" \
-		-e "s:SUIDMODE=.*4755:SUIDMODE=4711:" \
-		${mconfigs} || die "MCONFIG sed"
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	export CC="$(tc-getCC)"
-
-	econf || die "configure failed"
-}
-
-src_compile() {
-	emake -C lib xstrncpy.o || die "emake xstrncpy.o failed"
-	emake -C text-utils more || die "emake more failed"
-}
-
-src_install() {
-	exeinto /bin
-	doexe text-utils/more || die
-	doman text-utils/more.1 || die
-	dodoc HISTORY MAINTAINER README VERSION
-}