Bump 5.5.5, with testing - hopefully this can replace all older ebuilds and become new stable.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x786037A7

3 files changed, 193 insertions, 9 deletions

diff --git a/net-misc/hylafaxplus/ChangeLog b/net-misc/hylafaxplus/ChangeLog
index cc82b102c1b5..55c8f73ab457 100644
--- a/net-misc/hylafaxplus/ChangeLog
+++ b/net-misc/hylafaxplus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/hylafaxplus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafaxplus/ChangeLog,v 1.9 2014/01/13 06:51:44 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafaxplus/ChangeLog,v 1.10 2014/06/06 01:51:43 mattm Exp $
+
+*hylafaxplus-5.5.5 (06 Jun 2014)
+
+  06 Jun 2014; Matthew Marlowe <mattm@gentoo.org> +hylafaxplus-5.5.5.ebuild:
+  Bump 5.5.5, with testing - hopefully this can replace all older ebuilds and
+  become new stable.
 
   13 Jan 2014; Matthew Marlowe <mattm@gentoo.org> hylafaxplus-5.5.4-r1.ebuild:
   keyword 5.5.4-r1 patch bump for testing (~amd64,~x86)
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 2226e1617cb4..7fc32effcc49 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -7,19 +7,21 @@ AUX hylafaxplus-init 3139 SHA256 be1280b1e28f7135f9bad491bbd068eabe8c450f43f6989
 AUX ldconfig-patch 463 SHA256 7f2bef0bad6aa0c6474d3bdaf486a4637b75d3312348e6633a89fab66985786b SHA512 3729b8c1a7bc9e0a7fda33a7f57ead1fcbb3f3642f8639303acf079b32dc2856659a92bc39bf36606ffc042b0ba656b3b4e962eedda2cadca5247663893c0a9a WHIRLPOOL ae60a190e869ea1bf5ecc271af87d670eb1b093dd097e01d72eda28a55b8f6416c0fc575b5a7954e81221c8e0737c14b8d037853fa1d9ff31191691d7b45f7dc
 DIST hylafax-5.5.1.tar.gz 1304020 SHA256 96ac3dd60e3740184e3a5a68f0eeeafcede9aa9d3cc38bb3e8a4c06fb45f5f11 SHA512 689a4b4e4c0caa81257e75d939580bbe3feb80b057014a3a8aff6c3d7f6439edc63d75ff74742cce6d0a9b5496dbdffa6adf7851ba92e8debf7928f5a97b66c8 WHIRLPOOL b3a7ce46841dd58d6b51ad26f9563c75f0d58a919e75153598cc9f67c6befd2e6721bf78575a7a3829deb0872ab642f2b0cc76b9e36196b279a034600dd1b751
 DIST hylafax-5.5.4.tar.gz 1347860 SHA256 699ea9e05a251c0f120d753c3dab2ef347b6bb8fe362dac8ff3e4ece0fdac3ff SHA512 c26c722bf9261ffa154979e015c2cfed982caffd8c7663f471e369d05544eb24edb0e70c7f06d02b77bf71956ae7a242a48f31a6567785acd8707be3b6946161 WHIRLPOOL 779cbc292065867317a4d4fc73725acfc1c4d39b0cab6b2339a9303e91488180430d2d87f4fb52869daa0b1343a7a4b700fbf5e711288409372b4d08fbf514ce
+DIST hylafax-5.5.5.tar.gz 1353495 SHA256 2916fb7ed6141dd6433336ee3ec4f9d93183d1142d1ebbecf696c646348e1f12 SHA512 ee6225ae044c567093103f35c30d848db757636c1d8db78e8f7cb43eb01ea34ab229a81ca4175e2bf30d3c87b598d5b5797b7d92b0dc852bf4b69c697baca8cf WHIRLPOOL e0e387a60abe242011a88178000b91eb93a22363deb7df925e70f9a8293a55db79c859b89dd4d4ac8520c1f62f652edfcad1fbb9cb1be429e1b5765e7572bf23
 EBUILD hylafaxplus-5.5.1-r1.ebuild 4863 SHA256 c13e3884fee215cb618d59885e0c69e92983d20ca18511bf73358de4f4013d8e SHA512 1c70abd5cc277afe270e4d0f566d5264491a5174987a4a8520c3bf11cdd74268befb2b8ab8bd715aedb8c99bf9d8d5fbfe9cd327a14e3fc5916691d23117816c WHIRLPOOL cd341445e88c18ee925820d6f33fc5d54158aa773c4a8644ab843d7036df27dba66e8f632ce3bcef16a7c6f103b26a4510365af0f50728fe35bbc6892a276023
 EBUILD hylafaxplus-5.5.4-r1.ebuild 4809 SHA256 33927cc72f4a6081da82d6781a475c09f3069adfbb9647f3b6badaa69811e55f SHA512 69f1c21e81bb11d597f9fe3e5c18d3f25ea31cbad616f45131fe5ed342413b4ebae1232fd8895ca3aa1cc00cfdc75fc3e9b6b9b3fda936c96fcb8a014fc3878f WHIRLPOOL 9b8dc69559a3cc421c875be7fe3853a5a9621c6ddfc3ab4babd33daca13656f1e5f3f74e366ca9bd576b21785a6e86e8dfc3e9128123e69a5ca010065daf2727
 EBUILD hylafaxplus-5.5.4.ebuild 4759 SHA256 53aeedad0df53ddad8bca3c99119cdf99b88198d3bce272c6c934888e6acd0ab SHA512 f1747f161477cbb077d2d08a2f87482e18640885685f2e494da48b29bc1acf2ea162a5ea4ffd9e02d19ee90ded83c23048bc3a464e63a5b03e447753ea9bbff7 WHIRLPOOL 405a7eeff28c3a362ad7e944c1b439b97e90f650551f9adab8f913463c68e6e03791379d71e9ea93db3e2483e83a8c304548d4419a252f657cbf0ff9d7481f32
-MISC ChangeLog 2184 SHA256 dec394b3a320b73fd7fb42147ccd8bdc0b3a051dab3edf1312bda9b105fa2819 SHA512 b7e3c2ab2d9bbf97c3c8fb570589570ea7b9acf6205051eb5529036b72b252a4a7260c1edafa90ad065b22af72f560359e3369ccf3327393524a7809672a02eb WHIRLPOOL beaff45a84baf97b4df56dddf6002e71afb91f0ac6ef930df78f2a29e2f8934f8d913b7c8a86a8a225b3e1493d0739eef451eaa65477cb0325effeb01fc152e8
+EBUILD hylafaxplus-5.5.5.ebuild 4806 SHA256 22a0642407337f3a96ca700d67607aa83ac905c2ea6596e8639467dc42f2d268 SHA512 5c6506121191e7afe0a2c93076c5aac23bd473c22d955b659d80ebb2747507694a344f5b605314911ad54f464b76ef60291cbf97705ca591f1066adb2a329c7b WHIRLPOOL 1b9a74874fa540e75bac1502ec1f41c19e640d48a9e90fd5257de0c5a9df33ea18a74afe77be7c4a70646856dec51a7d26d7269dffcde8cccc22b4b09bbaf547
+MISC ChangeLog 2396 SHA256 60968bca5b89e52214f27f5309e068bc2c36d90172fb05a7c7670be71732c3d3 SHA512 f8fba0e616ca12a9cba4e403bcf94d356c5362f6ef6396898ef13d07aadd9ddbed3e8f9b632aabb60658ffa3c7c410529c116c4e9441c93b6a36a2b2b519fc40 WHIRLPOOL f901f5a0778d936cfaa338c5dee71918f614b709cd0dd9567d3f0f456baf33f3ca18e1323056cf3791d89987edecc2ae057211010fa98252e8a01d95ff1fb810
 MISC metadata.xml 620 SHA256 d8c1ce4499b907397bcb03086195b7d17456483d8582f0d725f9bd7e7f5c995d SHA512 25ac059d696814baff43d61be28e551bae7874685461a91e523669c23c285eb56f4c4ff1017e9e5990b131ff903a3770a92c4021b89963d26f402ab3b7c16a55 WHIRLPOOL 5d5d1d9ab11cddec2b50948646da9e038db0977e0f5da77bb3335f723add63bacf2a1fc36c32e5613a0d37b4834b8d1fe7d3092411b6b76a0e9e13db88b76828
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS040GAAoJEC1LWXx4YDenaYoIAKl65HW16bYe9UDjLR0tBW0f
-qHMPPtr2X3W7IN02KPZksIWnf5LhETcdD0ZJTQgzkGHEtzPUXAm1NMLNzKvMx6+U
-xO6G+s0XpiH2mAZ4cRIl9hPJgHj31Qk0ctBCrAdKyadUMsVguTaQgpjeZW/cDBzx
-a9OFEzqUDdqgAPrV+Spu1D6B+bLxtHBiIfPT17cBv3yzB8tsVgAcQW9EwGRFxKGh
-OpoCydcmgZYCvjOva4Yv1s5MAP1YZg7Lt1ABTUcKFGyW1ToGbiMFSIl35uRZv2Xy
-xBb10aSxDP1L7Tf3CT0KS0NpEga9GarZU4cz4cV7fasuJiIunhMteFBI1M+CnnU=
-=URnV
+iQEcBAEBCAAGBQJTkR62AAoJEC1LWXx4YDenQdYH/3/QGZlU4XPhMifUBoOoXanj
+8Gx+XmJKfXqXUkApc5V02IjQsxm4WEob9GPJYQiqJDUdS7iQpfMCTg+na1izcypy
+57edOX+emNSFz7RUClujUGge3i8EJlGqGU7w9jG60z+eU+Mbn5NNuAQ/0ZvXQTg5
+GH9cACOefNRkwnMHf0vzj2YKqX4CeBmW7R4e5uiek+mc1a+gMWViZrIDHqKYuzMh
+sccB3/ojmkaSxO2aW764Ol/UwXdB0I8rvKFL3iP375QBGd1wuLYx0bcesqZLhHtf
+pk/eBwguUwxb9VxOEqfTVorpZ2RHaLYJlu7GJz/uEIwckTQYB58ql5H/zTc87f8=
+=ngGv
 -----END PGP SIGNATURE-----
diff --git a/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild b/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild
new file mode 100644
index 000000000000..5e3caa382198
--- /dev/null
+++ b/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild,v 1.1 2014/06/06 01:51:43 mattm Exp $
+
+EAPI="5"
+
+inherit eutils multilib 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="http://hylafax.sourceforge.net"
+SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="hylafaxplus"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="jbig html ldap mgetty pam"
+
+DEPEND=">=sys-libs/zlib-1.1.4
+	app-text/ghostscript-gpl
+	virtual/mta
+	media-libs/tiff[jbig?]
+	virtual/jpeg
+	jbig? ( media-libs/jbigkit )
+	virtual/awk
+	ldap? (  net-nds/openldap )
+	pam? ( virtual/pam )
+	mgetty? ( net-dialup/mgetty[-fax] )"
+
+RDEPEND="${DEPEND}
+	net-mail/metamail
+	!net-dialup/sendpage"
+
+S="${WORKDIR}/${MY_P}"
+
+export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
+
+src_prepare() {
+	epatch "${FILESDIR}/ldconfig-patch"
+	epatch "${FILESDIR}/hylafax-cryptglibc.patch"
+
+	# 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 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
+
+	epatch_user
+}
+
+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/${P}/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="${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="${my_conf} \
+			--with-PATH_EGETTY=/bin/false \
+			--with-PATH_VGETTY=/bin/false"
+	fi
+
+	#--enable-pam isn't valid
+	use pam || my_conf="${my_conf} $(use_enable pam)"
+	use ldap || my_conf="${my_conf} $(use_enable ldap)"
+	use jbig || my_conf="${my_conf} $(use_enable jbig)"
+
+	tc-export CC CXX AR RANLIB
+
+	do_configure "${my_conf}"
+}
+
+src_compile() {
+	# Parallel building is borked
+	emake -j1
+}
+
+src_install() {
+	dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
+	dodir /var/spool /var/spool/recvq /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}
+
+	generate_files # in this case, it only generates the env.d entry
+
+	einfo "Adding env.d entry for ${PN}"
+	doenvd "${T}/99${PN}"
+
+	newconfd "${FILESDIR}/${PN}-conf" ${PN}
+	newinitd "${FILESDIR}/${PN}-init" ${PN}
+
+	use pam && pamd_mimic_system ${MY_PN} auth account session
+
+	dodoc CONTRIBUTORS README TODO
+	docinto samples
+}
+
+pkg_postinst() {
+	elog
+	elog "The faxonly USE flag has been removed; since ${PN} does not"
+	elog "require mgetty, and certain fax files conflict, you must build"
+	elog "mgetty without fax support if you wish to use them both.  You"
+	elog "may want to add both to package.use so any future updates are"
+	elog "correctly built:"
+	elog
+	elog "	net-dialup/mgetty -fax"
+	elog "	net-misc/hylafax [-mgetty|mgetty]"
+	elog
+	elog "See the docs and man pages for detailed configuration info."
+	elog
+	elog "Now run faxsetup and (if necessary) faxaddmodem."
+	elog
+}
+
+generate_files() {
+	cat <<-EOF > "${T}/99${PN}"
+	PATH="/var/spool/fax/bin"
+	CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
+	EOF
+}