[gentoo-commits] repo/gentoo:master commit in: profiles/, net-print/lprng/files/, net-print/lprng/

[gentoo-commits] repo/gentoo:master commit in: profiles/, net-print/lprng/files/, net-print/lprng/

[Michał Górny]

commit:     b6040dba6939728ae1cf32c8a64252affc547ec9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 08:23:38 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 08:28:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6040dba

net-print/lprng: Remove last-rited pkg

Closes: https://bugs.gentoo.org/496922
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-print/lprng/Manifest                      |  1 -
 net-print/lprng/files/lprng-3.8.27-certs.diff | 38 -------------
 net-print/lprng/files/lprng-3.8.28-krb.diff   | 11 ----
 net-print/lprng/files/lprng-3.8.28-make.diff  | 11 ----
 net-print/lprng/files/lprng-init              | 38 -------------
 net-print/lprng/files/printcap                | 23 --------
 net-print/lprng/lprng-3.8.35-r3.ebuild        | 80 ---------------------------
 net-print/lprng/metadata.xml                  | 16 ------
 profiles/package.mask                         |  8 ---
 9 files changed, 226 deletions(-)

diff --git a/net-print/lprng/Manifest b/net-print/lprng/Manifest
deleted file mode 100644
index 0bd5a98433b..00000000000
--- a/net-print/lprng/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST LPRng-3.8.35.tgz 12512453 BLAKE2B 82c23aa092ef5d9d946bc363c406aeaa9ef9cd566cb7ce353d0e7734ceab5fdd6129e6e1f9617d5e56481d93b3e30331a7dd128c5daff3e3609c67a022394d65 SHA512 ddebf23087b6c98c89369af26a2e46194c01243490ae47b025afde8ffcf0b1c05b9689702296c1a8aa38c2c38934df094d8cc7e922ab1ac27f51ce19f3676771

diff --git a/net-print/lprng/files/lprng-3.8.27-certs.diff b/net-print/lprng/files/lprng-3.8.27-certs.diff
deleted file mode 100644
index 13b9051aea0..00000000000
--- a/net-print/lprng/files/lprng-3.8.27-certs.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- LPRng-3.8.27/src/lprng_certs.orig	2004-12-20 00:29:21.000000000 +0100
-+++ LPRng-3.8.27/src/lprng_certs.sh	2004-12-20 00:33:49.000000000 +0100
-@@ -320,7 +320,9 @@
- # set default values
- 
- 
--CFG=/tmp/$$.sslcfg
-+TMPDIR=`mktemp -d -t lprng.XXXXXX` || { echo "$0: Cannot create temporary directory!" >&2 ; exit 1; }
-+trap "/bin/rm -rf ${TMPDIR}" 0 1 2 3 13 15
-+CFG=$TMPDIR/sslcfg
- 
- OPENSSL=/usr/bin/openssl
- CA_KEY=//etc/lprng/ssl.ca/ca.key
-@@ -508,14 +510,14 @@
- 	shift
- 	if [ "$1" = "" ] ; then usage; fi;
- 	if [ ! -f "$1" ] ; then useage; fi;
--	sed -n -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/p' $1 >/tmp/$$.key
--	sed -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/d' $1 >/tmp/$$.crt
--	STEP="" encrypt /tmp/$$.key
-+	sed -n -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/p' $1 >$TMPDIR/key
-+	sed -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/d' $1 >$TMPDIR/crt
-+	STEP="" encrypt $TMPDIR/key 
- 	status=$?
- 	echo STATUS $status
- 	if [ $status = 0 ] ; then
- 		mv $1 $1.orig
--		cat /tmp/$$.crt /tmp/$$.key >$1
-+		cat $TMPDIR/crt $TMPDIR/key >$1
- 	fi
-     ;;
- 
-@@ -845,5 +847,4 @@
-     exit 1
-     ;;
- esac
--rm -f ${CFG}
- exit $RET

diff --git a/net-print/lprng/files/lprng-3.8.28-krb.diff b/net-print/lprng/files/lprng-3.8.28-krb.diff
deleted file mode 100644
index 76381e560d0..00000000000
--- a/net-print/lprng/files/lprng-3.8.28-krb.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- LPRng-3.8.28/src/common/krb5_auth.c.org	2004-09-24 22:19:57.000000000 +0200
-+++ LPRng-3.8.28/src/common/krb5_auth.c	2006-10-13 09:19:44.000000000 +0200
-@@ -922,7 +922,7 @@
- 		nstored = 0;
- 	}
- 	
--	if ((cc = Read_fd_len_timeout(transfer_timeout, fd, len_buf, 4)) != 4) {
-+	if ((cc = Read_fd_len_timeout(transfer_timeout, fd, (char*)len_buf, 4)) != 4) {
- 		/* XXX can't read enough, pipe must have closed */
- 		return(0);
- 	}

diff --git a/net-print/lprng/files/lprng-3.8.28-make.diff b/net-print/lprng/files/lprng-3.8.28-make.diff
deleted file mode 100644
index 66c742dd994..00000000000
--- a/net-print/lprng/files/lprng-3.8.28-make.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- LPRng-3.8.28/Makefile.in.orig	2004-09-24 22:19:52.000000000 +0200
-+++ LPRng-3.8.28/Makefile.in	2006-06-27 09:26:13.000000000 +0200
-@@ -42,7 +42,7 @@
- LPD_CONF_PATH=\"@LPD_CONF_PATH@\"
- PRINTCAP_PATH=\"@PRINTCAP_PATH@\"
- LPD_PATH=\"@LPD_DIR@/lpd\"
--SHELL="@SHELL@"
-+SHELL=@SHELL@
- LOCKFILE=\"@LOCKFILE@\"
- CONFIG_SUBDIR="@CONFIG_SUBDIR@"
- PSHOWALL="@PSHOWALL@"

diff --git a/net-print/lprng/files/lprng-init b/net-print/lprng/files/lprng-init
deleted file mode 100644
index 115c8adf3ed..00000000000
--- a/net-print/lprng/files/lprng-init
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -e /etc/lprng/lpd.conf ] ; then
-		eerror "You need an /etc/lprng/lpd.conf file first"
-		eerror "There is a sample in  /usr/share/doc/LPRng"
-		return 1
-	fi
-	if [ ! -e /etc/lprng/printcap ] ; then
-		eerror "You need an /etc/lprng/printcap file first"
-		eerror "There is a sample in  /usr/share/doc/LPRng"
-		return 1
-	fi
-	if [ ! -e /etc/lprng/lpd.perms ] ; then
-		eerror "You need an /etc/lprng/lpd.perms file first"
-		eerror "There is  a sample in  /usr/share/doc/LPRng"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting lpd"
-	start-stop-daemon --start --pidfile "/var/run/lpd.515" --quiet --exec /usr/sbin/lpd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping lpd"
-	start-stop-daemon --stop --pidfile "/var/run/lpd.515" --quiet --exec /usr/sbin/lpd
-	eend $?
-}

diff --git a/net-print/lprng/files/printcap b/net-print/lprng/files/printcap
deleted file mode 100644
index c851e8e2e82..00000000000
--- a/net-print/lprng/files/printcap
+++ /dev/null
@@ -1,23 +0,0 @@
-# /etc/printcap: printer capability database.
-#
-# You can use the filter entries df, tf, cf, gf etc. for your
-# own filters. See the printcap(5) manpage for more details.
-
-lp|Generic dot-matrix printer entry
-        :lp=/dev/lp1
-        :sd=/var/spool/lpd/lp
-        :af=/var/log/lp-acct
-        :lf=/var/log/lp-errs
-        :pl#66
-        :pw#80
-        :pc#150
-        :mx#0
-        :sh
-
-# rlp|Remote printer entry
-#         :lp=
-#         :rm=remotehost
-#         :rp=remoteprinter
-#         :sd=/var/spool/lpd/remote
-#         :mx#0
-#         :sh

diff --git a/net-print/lprng/lprng-3.8.35-r3.ebuild b/net-print/lprng/lprng-3.8.35-r3.ebuild
deleted file mode 100644
index 7867f643f4c..00000000000
--- a/net-print/lprng/lprng-3.8.35-r3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-MY_PN=LPRng
-DESCRIPTION="Extended implementation of the Berkeley LPR print spooler"
-HOMEPAGE="http://www.lprng.com/"
-SRC_URI="ftp://ftp.lprng.com/pub/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tgz"
-
-LICENSE="|| ( GPL-2 Artistic )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="foomaticdb kerberos nls ssl"
-
-RDEPEND="sys-process/procps
-	ssl? ( dev-libs/openssl )
-	foomaticdb? ( net-print/cups-filters[foomatic]
-		net-print/foomatic-db )
-	!>=net-print/cups-1.6.2-r4[-lprng-compat]
-	!<net-print/cups-1.6.2-r4"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	kerberos? ( app-crypt/mit-krb5 )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.8.27-certs.diff
-	epatch "${FILESDIR}"/${PN}-3.8.28-make.diff
-	epatch "${FILESDIR}"/${PN}-3.8.28-krb.diff
-}
-
-src_configure() {
-	# wont compile with -O3, needs -O2
-	replace-flags -O[3-9] -O2
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable kerberos) \
-		$(use_enable ssl) \
-		--disable-setuid \
-		--disable-werror \
-		--with-userid=lp \
-		--with-groupid=lp \
-		--with-lpd_conf_path=/etc/lprng/lpd.conf \
-		--with-lpd_perms_path=/etc/lprng/lpd.perms \
-		--libexecdir=/usr/libexec/lprng \
-		--sysconfdir=/etc/lprng \
-		--disable-strip
-}
-
-src_compile() {
-	# bash is necessary due to bashisms in libtool
-	emake -j1 SHELL=/bin/bash
-}
-
-src_install() {
-	dodir /var/spool/lpd
-	diropts -m 700 -o lp -g lp
-	dodir /var/spool/lpd/lp
-
-	emake install \
-		DESTDIR="${D}" \
-		POSTINSTALL="NO" \
-		gnulocaledir="${D}"/usr/share/locale
-
-	dodoc CHANGES README VERSION "${FILESDIR}"/printcap lpd.conf lpd.perms
-
-	insinto /etc/lprng
-	doins "${FILESDIR}"/printcap lpd.conf lpd.perms
-	dosym /etc/lprng/printcap /etc/printcap
-	newinitd "${FILESDIR}"/lprng-init lprng
-}
-
-pkg_postinst() {
-	einfo "If printing does not work, try 'checkpc'/'checkpc -f'"
-}

diff --git a/net-print/lprng/metadata.xml b/net-print/lprng/metadata.xml
deleted file mode 100644
index 4aaa7226a2d..00000000000
--- a/net-print/lprng/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-<maintainer type="project">
-		<email>printing@gentoo.org</email>
-		<name>Gentoo Printing Project</name>
-	</maintainer>
-	<use>
-		<flag name='foomaticdb'>Add support for the foomatic printing
-			driver database</flag>
-	</use>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 53c4e516514..a331f5d4e1b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -579,14 +579,6 @@ net-misc/sjphone
 # -dropbox, -git, -mercurial, -subversion. Masked for removal in 30 days.
 kde-apps/dolphin-plugins
 
-# Michał Górny <mgorny@gentoo.org> (21 Mar 2019)
-# Not really maintained anymore.  Last upstream release is from 2015.
-# Fails to build against modern versions of app-crypt/mit-krb5, may have
-# more hidden issues.  It is probably time to move to net-print/cups.
-# net-print/magicfilter is the only reverse dependency (from 2011).
-# Removal in 30 days.  Bug #496922.
-net-print/lprng
-
 # Miroslav Šulc <fordfrog@gentoo.org> (19 Mar 2019)
 # Depends on >=virtual/{jdk,jre}-11 which is masked
 =www-servers/tomcat-9.0.17