gentoo auto-resync : 24:12:2022 - 08:01:36

6 files changed, 1 insertions, 516 deletions

diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 7194bbeda14b..81ed8807fa5c 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -1,11 +1,6 @@
-AUX hylafaxplus-7.0.2-tiff-4.2.patch 461 BLAKE2B 8afd4e3b41ee67c6c9d7aab50311fbaa6a08dee1937fc46a976f04dc3279beea791004eec59fcff19d3ef82df1d5be479480a1a49505adad6b1f420d5543e32c SHA512 5ed2b4845800ffeaed2d5df26856e9e7c8e9b375d07f1488cbff7d4c6156900dcb6ef89917d010520e87aeebf79a95b6dc77515019aa72e2058817b7b18a4e75
 AUX hylafaxplus-conf 572 BLAKE2B cd2b237704e0607565c16cf81593654d266c212810d0dcb399f35d980d04ed54a5bb961f2fd29dbc8386ef6684fe684a8bcbd21c9cd782490546554ec90e4b2e SHA512 ee97c45e49ed03bf2d393b7861fb8d0a92ce927243b7f1843c52de452540e78633e1a6d7b6892e6f5e30b5518b4b3d998354a3cfebe7adfd84da3f9586585621
-AUX hylafaxplus-init 3150 BLAKE2B 67b27c9e773d141c462b62882fa1ec592bdd30397c21c0dc0ef55384ac0d448803a8984c35eb22185c0aa315019eea1588829717b170f0b6168b549a270f2570 SHA512 6bc4db4597ef55aaf01bff66dfe7e9b3ce23d51e8d165f635ad49d9971260f8f131d386869787b2cd0de612d8ee784fb8f4e44fa8b8deb4eabf1aeab441e68f5
 AUX hylafaxplus-init-r1 3220 BLAKE2B d1cbf8ec446bffdfed9f78d2766b95a0bf6d645c2f3a5a27261100216a4f7b9d1b8115ece18bdd096652acf56520532673d4059b5c4519a4fa299f6c35846d51 SHA512 f7ef464dfc3065b760e46eaa029b862aefa2fe3c77262aeaa6bbdb1c14de9df5256c9def26a3fed9d50dc5c586206c015c58fbef27cc64e4961086f10dd6d91a
 AUX ldconfig-patch 467 BLAKE2B d19f7a8ebc79bb40d9935e1f327f3abfa2d336ea4af2026c784178c8110efe4a1bb2c19a17c9127f039d64c2e9115b5899d1999ed1f5ac7c999cdce79875e5b0 SHA512 eb7c154eac56e20a81b3396770442d93b6833c7961927f8264e3ed1aa72850e018fbe14760d7bd5be739d069769e3db3fd5848aaa936dd7509f03a289a146d4c
-DIST hylafax-7.0.3.tar.gz 1405116 BLAKE2B dbf8f87380929eb79ca0f18042c3397460dd6774f16defde8e9427d1d14094e00f6be491552f3ff6cc4c3d1fad0ec67a0c1a5fa3b4cb1e07c2f0c956eaefe8ed SHA512 938a21e4573fdf12bbc03dfee85e00555e7790a83a26316ac9cd1983501860858175d599c35f3b383cb0748518644587c203fb429966b5de3b615689d856281a
 DIST hylafax-7.0.6.tar.gz 1418749 BLAKE2B 83fff43dbc5c51f542aa847f61ae1617514a4260695d5c79a036416578ac632a778d0b5263a80fa7ccea9e9923a783759295a39199bdd32a2cb0ecac47ac91b4 SHA512 d1f69e13017f5d013ff39cf050c3a7ac6cef19a9ee5910ebe774a7ae06d7d22fd21e31de9734847764caea995539f578c3c458ecec7b9523b5823a841337d9cb
-EBUILD hylafaxplus-7.0.3-r7.ebuild 4032 BLAKE2B 314b23fd8c0f6f69864fa6e0acf5f81aad359a82fd35c450a13254a40535b1d05189950cf64428ee20cda4b1318d9e7a14a32cf68ed2e212e3a63a631a5a5321 SHA512 3afd1832d6662cdbcc4ddafb5036e21ea70226701bdf27c84129890d6972285e7d2ef6f0f6bd4036cfde7e05b30cd5b37115a53034526f0ee45c9fe09784e6d8
-EBUILD hylafaxplus-7.0.3-r8.ebuild 4190 BLAKE2B a8fa3e5ea906700435908ceab3cb296641f55907dfc9de8a8b6dccd209fea3837f2bff4dc246ab190213a5dbda51e1176c417df7cbb79b009166610bfa35ed5f SHA512 b5be1e511bf0565382887a78b8d42a6bc6c7b06cd1ec30b06678c047c44db89b932a13f0535e2a2dc1e18208f292db9c463ce9fc3616c7b3eed986dd06313d50
-EBUILD hylafaxplus-7.0.6-r3.ebuild 4056 BLAKE2B eddacab5fd4b558cb8a06f554b0db9d812a24f939385e94531a95a387ad714dd30e6ad0ba6f51e47070647690d2aeadac35007afbb3defb59d5210297b6c8545 SHA512 8fc9263e317eb2da01833d0db09aee635e29d048a17ccc5e05c3b14e8d96912c528c6fd3aa41b56de68769c92a737f30dc793b74f38d89d310ec67085f38ac9a
+EBUILD hylafaxplus-7.0.6-r3.ebuild 4055 BLAKE2B de04e3d241726c9f7dc63dc28c27f55859fe1f2a11ca02f22b4e79913acb450fd835a7bfb667f4c867581a684c0474ba9a89852dafa73c6308b8c353507d59cf SHA512 3c74dba926fd6ec0d60bed08b05a13fe4b71ead0e3220e6f72541c6314f6b34709ee1132e4af784dd339241f5f480d55ec563687ccf6d1cd65075b6a44ee2607
 MISC metadata.xml 497 BLAKE2B b3f400cee9f701675dfc8b5bd0a23d497b5f4d2e7211ba421b442782e90a1b60017d33ba482f614d0017f5abf2fa72e886ab445353eec72a9217c45aa23565ae SHA512 4b0b543bf8816e2ffff95334bf0cb64e022cc507f5ccc6b766dd183d272303d31cb43b4b6c4352991b1ceba8aaefc76276e64c5adda3caae9bff5872189deef3
diff --git a/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch b/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch
deleted file mode 100644
index 8c4dbda35cc5..000000000000
--- a/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/706154
-https://bugs.gentoo.org/810658
---- a/configure
-+++ b/configure
-@@ -2583,7 +2583,7 @@ EOF
- 				echo '#define TIFFSTRIPBYTECOUNTS uint32'
- 				echo '#define TIFFVERSION TIFF_VERSION'
- 				echo '#define TIFFHEADER TIFFHeader';;
--		4.[01])		tiff_runlen_t="uint32"
-+		4.[0123456789])	tiff_runlen_t="uint32"
- 				tiff_offset_t="uint64"
- 				echo '#define TIFFSTRIPBYTECOUNTS uint64'
- 				echo '#define TIFFVERSION TIFF_VERSION_CLASSIC'
diff --git a/net-misc/hylafaxplus/files/hylafaxplus-init b/net-misc/hylafaxplus/files/hylafaxplus-init
deleted file mode 100644
index c15f26774a86..000000000000
--- a/net-misc/hylafaxplus/files/hylafaxplus-init
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Author Geaaru
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="zap"
-
-depend() {
-	use lo
-}
-
-checkconfig() {
-	ebegin "Check hylafax server configuration..."
-
-	if [ x$spooldir == x ] ; then
-		eerror "No spooldir directory defined"
-		return 1
-	else
-		SPOOL=$spooldir
-		einfo "Use spool directory $SPOOL"
-	fi
-
-	if [ x$mode == x ] ; then
-		eerror "No mode defined"
-		return 1
-	fi
-
-	if [ ! -f $SPOOL/etc/setup.cache ] ; then
-		eerror "No $SPOOL/etc/setup.cache file founded. Use faxsetup command"
-		return 1
-	fi
-
-	if [[ x$hfaxd == x || ! -f $hfaxd ]] ; then
-		eerror "No hfaxd daemon founded"
-		return 1
-	fi
-
-	if [[ x$faxq == x || ! -f $faxq ]] ; then
-		eerror "No faxq program founded"
-		return 1
-	fi
-
-	if [[ x$faxgetty == x || ! -f $faxgetty ]] ; then
-		eerror "No faxgetty program founded"
-		return 1
-	fi
-
-	if [ x$faxbind == x ] ; then
-		eerror "No binding address supply"
-		return 1
-	fi
-
-	if [ x$piddir == x ] ; then
-		PIDDIR=$SPOOL
-	else
-		PIDDIR=$piddir
-	fi
-
-
-	hfaxd_args="-l $faxbind -q $SPOOL"
-
-	case $mode in
-		newproto)
-			if [[ x$faxport == x ]] ; then
-				eerror "No faxport defined"
-				return 1
-			fi
-			hfaxd_args="$hfaxd_args -i $faxport"
-			;;
-		oldproto)
-			if [[ x$oldprotoport == x ]] ; then
-				eerror "No oldprotoport defined"
-				return 1
-			fi
-			hfaxd_args="$hfaxd_args -o $oldprotoport"
-			;;
-		snpp)
-			if [[ x$snppport == x ]] ; then
-				eerror "No snppport defined"
-				return 1
-			fi
-			hfaxd_args="$hfaxd_args -s $snppport"
-			;;
-		any)
-			if [[ x$faxport == x || x$snppport == x || x$oldprotoport == x ]] ; then
-				eerror "No port data founded for old services"
-				return 1
-			fi
-			hfaxd_args="$hfaxd_args -i $faxport -s $snppport -o $oldprotoport"
-			;;
-		*)
-			eerror "Invalid mode"
-			return 1
-			;;
-
-	esac
-
-	faxq_args="-q $SPOOL"
-
-	# workaround for manage save of pidfile with start-stop-daemon
-	hfaxd_args="$hfaxd_args -d"
-	faxq_args="$faxq_args -D"
-		
-	return 0
-}
-
-start() {
-	local result
-
-	checkconfig || return 1
-
-	ebegin "Starting HylaFAX server daemons"
-
-	start_faxq
-	result=$?
-
-	if [ $result -ne 0 ]  ; then
-		eerror "Error on start $faxq daemon"
-		return 1
-	fi
-
-	start_hfaxd
-	result=$?
-
-	eend $result
-}
-
-start_hfaxd() {
-	local arguments="--start \
-			 --make-pidfile --pidfile $PIDDIR/hfaxd.pid"
-	
-	einfo "Starting $hfaxd with args $hfaxd_args"
-
-	start-stop-daemon -b ${arguments} --exec $hfaxd -- $hfaxd_args > /dev/null 2>&1
-
-	return $?;
-}
-
-start_faxq() {
-	local arguments="--start \
-			 --make-pidfile --pidfile $PIDDIR/faxq.pid"
-	einfo "Starting $faxq ... "
-
-	start-stop-daemon -b ${arguments} --exec $faxq -- $faxq_args > /dev/null 2>&1
-	
-	return $?
-}
-
-stop() {
-	checkconfig || return 1
-
-	ebegin "Stopping HylaFAX server daemons"
-	
-	start-stop-daemon --stop --quiet --pidfile $PIDDIR/hfaxd.pid
-	start-stop-daemon --stop --quiet --pidfile $PIDDIR/faxq.pid
-	eend $?
-}
-
-zap() {
-	checkconfig || return 1
-
-	ebegin "Zap HylaFAX server daemon files"
-
-	if [ -f $PIDFILE/hfaxd.pid ] ; then
-		rm -f $PIDFILE/hfaxd.pid
-	fi
-
-	if [ -f $PIDFILE/faxq.pid ] ; then
-		rm -f $PIDFILE/faxq.pid
-	fi
-}
-
-restart() {
-	stop
-	start
-}
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r7.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r7.ebuild
deleted file mode 100644
index 9f1fb4d2a5bd..000000000000
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r7.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit edo pam toolchain-funcs
-
-MY_PN="${PN/plus/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
-HOMEPAGE="https://hylafax.sourceforge.io/"
-SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="hylafaxplus"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="html jbig lcms ldap mgetty pam"
-
-DEPEND="
-	app-text/ghostscript-gpl
-	media-libs/tiff:=[jbig?]
-	media-libs/libjpeg-turbo:=
-	>=sys-libs/zlib-1.1.4
-	app-alternatives/awk
-	virtual/libcrypt:=
-	virtual/mta
-	jbig? ( media-libs/jbigkit )
-	lcms? ( media-libs/lcms )
-	ldap? ( net-nds/openldap:= )
-	mgetty? ( net-dialup/mgetty[-fax] )
-	pam? ( sys-libs/pam )
-"
-RDEPEND="
-	${DEPEND}
-	!net-dialup/mgetty[fax]
-	!net-dialup/sendpage
-"
-
-CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
-CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
-
-PATCHES=(
-	"${FILESDIR}"/ldconfig-patch
-	"${FILESDIR}"/${PN}-7.0.2-tiff-4.2.patch
-)
-
-src_prepare() {
-	default
-
-	# Force it not to strip binaries
-	for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
-		hfaxd sendfax sendpage ; do
-			sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
-				"${dir}"/Makefile.in || die "sed on ${dir}/Makefile.in failed"
-	done
-
-	sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed"
-
-	# Respect LDFLAGS (at least partially)
-	sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed"
-
-	sed -i -e "s|-fpic|-fPIC|g" \
-		configure || die
-}
-
-src_configure() {
-	local my_conf=(
-		--with-DIR_BIN=/usr/bin
-		--with-DIR_SBIN=/usr/sbin
-		--with-DIR_LIB=/usr/$(get_libdir)
-		--with-DIR_LIBEXEC=/usr/sbin
-		--with-DIR_LIBDATA=/usr/$(get_libdir)/fax
-		--with-DIR_LOCALE=/usr/share/locale
-		--with-DIR_LOCKS=/var/lock
-		--with-DIR_MAN=/usr/share/man
-		--with-DIR_SPOOL=/var/spool/fax
-		--with-DIR_HTML=/usr/share/doc/${PF}/html
-		--with-DIR_CGI="${WORKDIR}"
-		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
-		--with-PATH_IMPRIP=""
-		--with-SYSVINIT=no
-		--with-REGEX=yes
-		--with-LIBTIFF="-ltiff -ljpeg -lz"
-		--with-OPTIMIZER="${CFLAGS}"
-		--with-DSO=auto
-		--with-HTML=$(usex html)
-	)
-
-	if use mgetty; then
-		my_conf+=(
-			--with-PATH_GETTY=/sbin/mgetty
-			--with-PATH_EGETTY=/sbin/mgetty
-			--with-PATH_VGETTY=/usr/sbin/vgetty
-		)
-	else
-		# GETTY defaults to /sbin/agetty
-		my_conf+=(
-			--with-PATH_EGETTY=/bin/false
-			--with-PATH_VGETTY=/bin/false
-		)
-	fi
-
-	# --enable-pam isn't valid
-	use pam || my_conf+=( $(use_enable pam) )
-	use lcms || my_conf+=( $(use_enable lcms) )
-	use ldap || my_conf+=( $(use_enable ldap) )
-	use jbig || my_conf+=( $(use_enable jbig) )
-
-	tc-export CC CXX AR RANLIB
-
-	edo ./configure --nointeractive "${my_conf[@]}"
-}
-
-src_compile() {
-	# Parallel building is borked, bug #????
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
-	dodir /var/spool /var/spool/fax
-	fowners uucp:uucp /var/spool/fax
-	fperms 0600 /var/spool/fax
-
-	dodir /usr/share/doc/${PF}/samples
-	emake DESTDIR="${D}" \
-		BIN="${D}/usr/bin" \
-		SBIN="${D}/usr/sbin" \
-		LIBDIR="${D}/usr/$(get_libdir)" \
-		LIB="${D}/usr/$(get_libdir)" \
-		LIBEXEC="${D}/usr/sbin" \
-		LIBDATA="${D}/usr/$(get_libdir)/fax" \
-		DIR_LOCALE="${D}/usr/share/locale" \
-		MAN="${D}/usr/share/man" \
-		SPOOL="${D}/var/spool/fax" \
-		HTMLDIR="${D}/usr/share/doc/${PF}/html" \
-		install
-
-	keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
-	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
-
-	einfo "Adding env.d entry for ${PN}"
-	newenvd - 99hylafaxplus <<-EOF
-		PATH="/var/spool/fax/bin"
-		CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
-		CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog"
-	EOF
-
-	newconfd "${FILESDIR}"/${PN}-conf ${PN}
-	newinitd "${FILESDIR}"/${PN}-init-r1 ${PN}
-
-	use pam && pamd_mimic_system ${MY_PN} auth account session
-
-	einstalldocs
-	docinto samples
-}
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r8.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r8.ebuild
deleted file mode 100644
index 3f86a507030c..000000000000
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r8.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam toolchain-funcs
-
-MY_PN="${PN/plus/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
-HOMEPAGE="https://hylafax.sourceforge.io/"
-SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-SLOT="0"
-LICENSE="hylafaxplus"
-KEYWORDS="amd64 x86"
-IUSE="html jbig lcms ldap mgetty pam"
-
-DEPEND="
-	app-text/ghostscript-gpl
-	media-libs/tiff:=[jbig?]
-	media-libs/libjpeg-turbo:=
-	!net-dialup/mgetty[fax]
-	>=sys-libs/zlib-1.1.4
-	app-alternatives/awk
-	virtual/mta
-	jbig? ( media-libs/jbigkit )
-	lcms? ( media-libs/lcms )
-	ldap? (  net-nds/openldap:= )
-	mgetty? ( net-dialup/mgetty[-fax] )
-	pam? ( sys-libs/pam )
-"
-RDEPEND="${DEPEND}
-	!net-dialup/sendpage
-"
-
-CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
-CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
-
-PATCHES=(
-	"${FILESDIR}/ldconfig-patch"
-	"${FILESDIR}"/${PN}-7.0.2-tiff-4.2.patch
-)
-
-src_prepare() {
-	default
-
-	# force it not to strip binaries
-	for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
-		hfaxd sendfax sendpage ; do
-			sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
-				"${dir}"/Makefile.in || die "sed on ${dir}/Makefile.in failed"
-	done
-
-	sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed"
-
-	# Respect LDFLAGS(at least partially)
-	sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed"
-
-	sed -i -e "s|-fpic|-fPIC|g" \
-		configure || die
-}
-
-src_configure() {
-	do_configure() {
-		echo ./configure --nointeractive ${1}
-		# eval required for quoting in ${my_conf} to work properly, better way?
-		eval ./configure --nointeractive ${1} || die "./configure failed"
-	}
-
-	local my_conf=(
-		--with-DIR_BIN=/usr/bin
-		--with-DIR_SBIN=/usr/sbin
-		--with-DIR_LIB=/usr/$(get_libdir)
-		--with-DIR_LIBEXEC=/usr/sbin
-		--with-DIR_LIBDATA=/usr/$(get_libdir)/fax
-		--with-DIR_LOCALE=/usr/share/locale
-		--with-DIR_LOCKS=/var/lock
-		--with-DIR_MAN=/usr/share/man
-		--with-DIR_SPOOL=/var/spool/fax
-		--with-DIR_HTML=/usr/share/doc/${PF}/html
-		--with-DIR_CGI="${WORKDIR}"
-		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
-		--with-PATH_IMPRIP=""
-		--with-SYSVINIT=no
-		--with-REGEX=yes
-		--with-LIBTIFF=\"-ltiff -ljpeg -lz\"
-		--with-OPTIMIZER=\"${CFLAGS}\"
-		--with-DSO=auto
-		--with-HTML=$(usex html)
-	)
-
-	if use mgetty; then
-		my_conf+=(
-			--with-PATH_GETTY=/sbin/mgetty
-			--with-PATH_EGETTY=/sbin/mgetty
-			--with-PATH_VGETTY=/usr/sbin/vgetty
-		)
-	else
-		# GETTY defaults to /sbin/agetty
-		my_conf+=(
-			--with-PATH_EGETTY=/bin/false
-			--with-PATH_VGETTY=/bin/false
-		)
-	fi
-
-	#--enable-pam isn't valid
-	use pam || my_conf+=( $(use_enable pam) )
-	use lcms || my_conf+=( $(use_enable lcms) )
-	use ldap || my_conf+=( $(use_enable ldap) )
-	use jbig || my_conf+=( $(use_enable jbig) )
-
-	tc-export CC CXX AR RANLIB
-
-	do_configure "${my_conf[*]}"
-}
-
-src_compile() {
-	# Parallel building is borked, bug #????
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
-	dodir /var/spool /var/spool/fax
-	fowners uucp:uucp /var/spool/fax
-	fperms 0600 /var/spool/fax
-	dodir "/usr/share/doc/${P}/samples"
-
-	emake DESTDIR="${D}" \
-		BIN="${D}/usr/bin" \
-		SBIN="${D}/usr/sbin" \
-		LIBDIR="${D}/usr/$(get_libdir)" \
-		LIB="${D}/usr/$(get_libdir)" \
-		LIBEXEC="${D}/usr/sbin" \
-		LIBDATA="${D}/usr/$(get_libdir)/fax" \
-		DIR_LOCALE="${D}/usr/share/locale" \
-		MAN="${D}/usr/share/man" \
-		SPOOL="${D}/var/spool/fax" \
-		HTMLDIR="${D}/usr/share/doc/${PF}/html" \
-		install
-
-	keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
-	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
-
-	einfo "Adding env.d entry for ${PN}"
-	newenvd - 99hylafaxplus <<-EOF
-		PATH="/var/spool/fax/bin"
-		CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
-		CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog"
-	EOF
-
-	newconfd "${FILESDIR}/${PN}-conf" ${PN}
-	newinitd "${FILESDIR}/${PN}-init" ${PN}
-
-	use pam && pamd_mimic_system ${MY_PN} auth account session
-
-	einstalldocs
-	docinto samples
-}
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild
index b7e589501c96..c2207fd1949d 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild
@@ -42,7 +42,6 @@ CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
 CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
 
 # See bug #706154, bug #810658 if need to patch for newer libtiff.
-
 PATCHES=(
 	"${FILESDIR}"/ldconfig-patch
 )