Bump 5.5.1-r1, hylafaxplus really needs -j1 to avoid build bugs, will discuss with upstream. Also keywording ~amd64/~x86 as initial tests have been very good.

Package-Manager: portage-2.1.10.55/cvs/Linux x86_64

3 files changed, 197 insertions, 9 deletions

diff --git a/net-misc/hylafaxplus/ChangeLog b/net-misc/hylafaxplus/ChangeLog
index 2fd056b0cc82..bb6f366e5b17 100644
--- a/net-misc/hylafaxplus/ChangeLog
+++ b/net-misc/hylafaxplus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/hylafaxplus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafaxplus/ChangeLog,v 1.1 2012/04/05 17:57:40 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafaxplus/ChangeLog,v 1.2 2012/04/05 19:18:22 mattm Exp $
+
+  05 Apr 2012; Matthew Marlowe <mattm@gentoo.org> +hylafaxplus-5.5.1-r1.ebuild:
+  tests for 5.5.1 have been good so far, keywording for ~amd64/~x86
+
+*hylafaxplus-5.5.1-r1 (05 Apr 2012)
+
+  05 Apr 2012; Matthew Marlowe <mattm@gentoo.org> +hylafaxplus-5.5.1-r1.ebuild:
+  hylafax really does require -j1. Repoman is going to be unhappy.
 
   05 Apr 2012; Matthew Marlowe <mattm@gentoo.org> +hylafaxplus-5.5.1.ebuild,
   +files/hylafaxplus-conf, +files/hylafaxplus-init, +files/ldconfig-patch,
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index c71753868f8f..24577b7fd706 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -5,17 +5,18 @@ AUX hylafaxplus-conf 572 RMD160 6494a6799af3708890fbe386678dc3f6498bae3b SHA1 7b
 AUX hylafaxplus-init 3139 RMD160 f1183b6622cfec7b914dee456c7ce7008ef17967 SHA1 263bd93fc5ca9e9a1e17397776a498b2468f2d93 SHA256 be1280b1e28f7135f9bad491bbd068eabe8c450f43f69892676c5bea1bc7ebfd
 AUX ldconfig-patch 463 RMD160 0ec21efb03d7c2e1b8ad109af5f416d6e9503729 SHA1 9d583db8da2eb460a0d48a82c79eef3f85f66c71 SHA256 7f2bef0bad6aa0c6474d3bdaf486a4637b75d3312348e6633a89fab66985786b
 DIST hylafax-5.5.1.tar.gz 1304020 RMD160 5d8cfb64e903f5cf616aef9eacf0bea0daa0d316 SHA1 7ed0b864dd89689088c9a4256205afcb2444726b SHA256 96ac3dd60e3740184e3a5a68f0eeeafcede9aa9d3cc38bb3e8a4c06fb45f5f11
+EBUILD hylafaxplus-5.5.1-r1.ebuild 4866 RMD160 3e002655d68bca21e74a8a80999c9c40b82226c4 SHA1 2ae051de9f17f1e643ded371aeb8d96eef2832f6 SHA256 6855be6b940a42c61a4984b66db33bb38628a8bf2ecd5fbe53493029983f2e85
 EBUILD hylafaxplus-5.5.1.ebuild 5229 RMD160 f74354dbc17daaedffb0b5bf487905a127e914fa SHA1 98da2b459d4ff26629b6b987de6bac7ad0579d02 SHA256 c396b537b55671da27dbfc594b631cdf9fd36d7ba79525b4d47c0fdff6f9f972
-MISC ChangeLog 741 RMD160 e9d97538525430306103008ff5c0af4e2062a84a SHA1 dcd14d1c6f5e1a45303017afe7c66484b854da32 SHA256 0fd8be88e7afe57814801e6c082831a80f70f8724ce8466c1a7a35e0bb69f77f
+MISC ChangeLog 1075 RMD160 d4abe4c74fae4c0e1e4789c63a323f3ae45a6480 SHA1 064bb3416e7d17e0074c6df9cc5c9d72c638bf3a SHA256 2d5dfe6e602142ba03961bf624a2f459096ccaf37cde4d1f994da8f661dbfcb6
 MISC metadata.xml 579 RMD160 b975907833247c77f3c0a131dc4b66c928267041 SHA1 79feeb7a8314fd90c8ae3edea9ff413529bbdb0e SHA256 52e22dd8e1acd94aea28b013c232afe316b2b3eb69cd52e4e2d25949fed6bf2d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPfd0eAAoJEC1LWXx4YDenFzAH/RrW6EPqQAuJfgoal/IXVDWw
-RwWQtzlcs/vWFapQjb4b7BeS3bO1QsN+Db2TspaNjZw0g+lu9aXKU6Gfb0/0uuUL
-Y8jEnv0zHlpHMvC1RyWylUMeHCiDc2UtxvAT/qyy87UbkCSHEl+YARuZcbIL9i/4
-hfNrJeIM2lLFNu+byO7g8ld8bu+p1oOfcS3/Q6QWeN4NpV48ZuxIumak5dqV31xB
-ArBal1AtE6NXqv+dlYFR0O+H9sbIX0pIjICjDkpqIMZKgcDZLh9o4+6Nsh91uWvG
-Zp65TU4m8Fekw+0bcCR3ubHIcHC9jgwRVJzhuKMqQPsNUDpYn1R9OiO98n3qJsE=
-=rQX2
+iQEcBAEBAgAGBQJPffAIAAoJEC1LWXx4YDenF9gIAJu0yrg5rNPpk5phxMnsYWeZ
+FHNv6QyN8vkUV4PYTCMY68+mqjAWBI3QQeHncw3cucAqJ0aLuUBJi7xYEBzhbBKC
+OgvpV/CnCICXZ9FDLThf4pS9P6y/dpTzRxO7/fVKzLEmqRyDS8+KVaMKveO3wpka
+vJjV9SrfB4f/MYeuU8l8Bibp4CMqg/lvyOOJCP/jeuRYtsHhDmXNf/VS4y8Csj/g
+6qfQ8JAWUwkbjH1Z50UItEfbHe5MrLTH1qh1tLiBk8T3xokjrWCASAE+LegmQUEW
+NzoWkaE3Ht1qTITfpNR/IFwT/dTIhLYNff0eb6k6hOzhEK2gvfjPXN9lekwHsmk=
+=02UN
 -----END PGP SIGNATURE-----
diff --git a/net-misc/hylafaxplus/hylafaxplus-5.5.1-r1.ebuild b/net-misc/hylafaxplus/hylafaxplus-5.5.1-r1.ebuild
new file mode 100644
index 000000000000..3a4b80b21158
--- /dev/null
+++ b/net-misc/hylafaxplus/hylafaxplus-5.5.1-r1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafaxplus/hylafaxplus-5.5.1-r1.ebuild,v 1.1 2012/04/05 19:18:22 mattm Exp $
+
+EAPI="2"
+
+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="~x86 ~amd64"
+
+IUSE="jbig pam mgetty html ldap"
+
+DEPEND=">=sys-libs/zlib-1.1.4
+	!net-misc/hylafax
+	app-text/ghostscript-gpl
+	virtual/mta
+	media-libs/tiff[jbig?]
+	virtual/jpeg
+	jbig? ( media-libs/jbigkit )
+	sys-apps/gawk
+	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"
+	# 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|-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/${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"
+
+	if use html; then
+		my_conf="${my_conf} --with-HTML=yes"
+	else
+		my_conf="${my_conf} --with-HTML=no"
+	fi
+
+	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
+
+	if [ -h /etc/localtime ]; then
+		local continent=$(readlink /etc/localtime | cut -d / -f 5)
+		if [ "${continent}" == "Europe" ]; then
+			my_conf="${my_conf} --with-PAGESIZE=A4"
+		fi
+	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)"
+
+	myconf="CC=$(tc-getCC) CXX=$(tc-getCXX) ${my_conf}"
+
+	# eval required for quoting in ${my_conf} to work properly, better way?
+	eval ./configure --nointeractive ${my_conf} || die "./configure failed"
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
+	dodir /var/spool /var/spool/recvq
+	fowners uucp:uucp /var/spool/fax
+	fperms 0600 /var/spool/fax
+	dodir /usr/share/doc/${P}/samples
+
+	emake \
+		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/${P}/html \
+		install DESTDIR="${D}" || die "make install failed"
+
+	keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
+	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
+
+	dosed "s:hostname:hostname -f:g" /var/spool/fax/bin/{faxrcvd,pollrcvd} \
+		|| die "dosed hostname failed"
+
+	generate_files # in this case, it only generates the env.d entry
+
+	einfo "Adding env.d entry for ${PN}"
+	doenvd 99${P}
+
+	einfo "Adding init.d and conf.d entries for ${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 > 99${P}
+	PATH="/var/spool/fax/bin"
+	CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
+	EOF
+}