revamp logic to pkg_setup(); add another built_with_use check for USE=fax on net-dialup/mgetty

Package-Manager: portage-2.1.3.19

3 files changed, 33 insertions, 10 deletions

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index a67e520dd84a..0f584059df3d 100644
--- a/net-misc/hylafax/ChangeLog
+++ b/net-misc/hylafax/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/hylafax
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.78 2007/10/17 21:19:36 nerdboy Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.79 2008/02/04 09:49:06 opfer Exp $
+
+  04 Feb 2008; Christian Faulhammer <opfer@gentoo.org> hylafax-4.3.1.ebuild:
+  revamp logic to pkg_setup(); add another built_with_use check for USE=fax on
+  net-dialup/mgetty
 
   17 Oct 2007; Steve Arnold <nerdboy@gentoo.org> hylafax-4.2.5.ebuild,
   hylafax-4.3.0.ebuild, hylafax-4.3.1.ebuild:
diff --git a/net-misc/hylafax/Manifest b/net-misc/hylafax/Manifest
index d582f7c2cc91..a6708dad725b 100644
--- a/net-misc/hylafax/Manifest
+++ b/net-misc/hylafax/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 99hylafax-4.2 75 RMD160 7556741a394736417cf3b9db352642b75996b54f SHA1 7544e149ac495b06be039869686c673d8ac8c0f1 SHA256 0cdc13f4db03ad4ca97be8d7671d49da947660ec071fc99786f68e440c3b0e84
 AUX gentoo-gcc-version.patch 531 RMD160 26ba57b0df2e8bd9b5eaf77f7434da2563345c64 SHA1 0a9fd0254e3b0ed1c85deb2c7efb1ce06b040381 SHA256 7736dfc09d25b49530dac45a297fa7dcebdc445e95e5bcd24a2dd08816eaa79d
 AUX hylafax-4.2 3759 RMD160 d8a10429e912eaace4af98ee306c14b3f59ca7b4 SHA1 b41d462b94851544ce2e52b751ab956003a4e06a SHA256 83f1ba9a169f24721a4115dda3f3924c14804a09be2ff284fa52caeee455d166
@@ -10,6 +13,13 @@ DIST hylafax-4.3.0.tar.gz 1468136 RMD160 29c62721e4895848b325f4f3a7b7e7782e275aa
 DIST hylafax-4.3.1.tar.gz 1498444 RMD160 1a29d43a05793ec4185c96ca16698268ae3f7c9b SHA1 9b42872912f2b75949423b76ab5f1b5e2caef869 SHA256 b777c0d8f1f858f3c86f91f9ae4fde9246646ac9e753154b969cb7c3a49947ab
 EBUILD hylafax-4.2.5.ebuild 4339 RMD160 06384897be4776b452d7d7139bdda097f976a76f SHA1 fcc0e92e493d110cc783603fc60b092d226241f9 SHA256 fec942f14ac11b35cddffd6f53adad2ee49269f4e9567449f820ba51e1444417
 EBUILD hylafax-4.3.0.ebuild 4551 RMD160 a0450e170eae096e28270001586d0dfb7541fca3 SHA1 9cb0032df385a65fe6ee09d9d262f92845574a70 SHA256 7a3c2efb5a2ed011abcfcd9674735f15d525203dd5909997e42eca53a398934c
-EBUILD hylafax-4.3.1.ebuild 4934 RMD160 72d42f85685df824f766e754783d73f33c883e7c SHA1 72aaa0e700c66d506309d6246bab4ffc10875025 SHA256 bbc95d62d5d9d0dcc3895e2da42fa65db6903007c89016a0dc15a60db0efe43a
-MISC ChangeLog 16578 RMD160 4b0979073f83a5224a6d7c84c7f51d2e11413a7b SHA1 3f25e5c5cb661b6aa9c41a860348cd788107f781 SHA256 3233eb76aa86222f63cd8fb43bb65faff12f2aa71e94490ea1e56f050092a034
+EBUILD hylafax-4.3.1.ebuild 5100 RMD160 b3fe1cc2fb32a6bd1d75d05441539eae7a61fa4d SHA1 95214b0860416efd6e06039da3fc371e5f6d2aa6 SHA256 996f57472d29bca59b8c475e1a04798f31fe5897863f21b0e57b058f6e144b8c
+MISC ChangeLog 16753 RMD160 dce1cfdcab46a1f225ebe204b95a6fca5d4ce5fc SHA1 1141db3f963057ddd5e5fc2e171c09bacefe472a SHA256 f1de58bf8d00b1c6de48a5edc43d0db1ed61f7f9d31c3d6f955df8487e666451
 MISC metadata.xml 680 RMD160 f534f59f38ba9db8b9ec24d72164ef99e90d0e55 SHA1 927f92ce08fdd3c4018e0d231afa81265c4d2525 SHA256 2b5b94cc0d6e9c9cfcc5b8908abb649de267dbc9f4fc2e949a246f79745cf5fd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHpt/VNQqtfCuFneMRAq00AJ9aOGUqwQDRsdNuCUTJoB4IaadNBgCfVsAE
+YdwYabz1Snr3/jHmB/pV4m4=
+=E1X0
+-----END PGP SIGNATURE-----
diff --git a/net-misc/hylafax/hylafax-4.3.1.ebuild b/net-misc/hylafax/hylafax-4.3.1.ebuild
index d08a1bf1e0ad..2fd79b59501c 100644
--- a/net-misc/hylafax/hylafax-4.3.1.ebuild
+++ b/net-misc/hylafax/hylafax-4.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.3.1.ebuild,v 1.7 2007/10/17 21:19:36 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.3.1.ebuild,v 1.8 2008/02/04 09:49:06 opfer Exp $
 
 inherit eutils multilib pam flag-o-matic toolchain-funcs
 
@@ -29,12 +29,19 @@ RDEPEND="${DEPEND}
 
 export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
 
-src_compile() {
+pkg_setup() {
 	if use faxonly; then
 		if use mgetty; then
-			eerror "You cannot set both faxonly and mgetty, please remove one." && die "invalid use flags"
+			eerror "You cannot set both faxonly and mgetty, please remove one."
+			die "invalid USE flags"
 		fi
 	fi
+
+	if built_with_use --missing true net-dialup/mgetty fax; then
+		eerror "net-dialup/mgetty must be installed without USE=fax"
+		die "merge net-dialup/mgetty without USE=fax"
+	fi
+
 	if use jbig; then
 		einfo       "Checking for tiff compiled with jbig support..."
 		if built_with_use media-libs/tiff jbig; then
@@ -45,7 +52,9 @@ src_compile() {
 			die "Tiff not merged with jbig USE flag"
 		fi
 	fi
+}
 
+src_compile() {
 	# Hylafax doesn't play nice with gcc-3.4 and SSP (bug #74457)
 	# so drop the flags until a better solution comes along
 	[ $(gcc-major-version) -eq 3 ] && [ $(gcc-minor-version) -ge 4 ] \
@@ -97,7 +106,7 @@ src_compile() {
 	fi
 
 	use faxonly && my_conf="${my_conf} --with-PATH_GETTY=/bin/false
-	                                  --with-PATH_VGETTY=/bin/false"
+									  --with-PATH_VGETTY=/bin/false"
 	#--enable-pam isn't valid
 	use pam || my_conf="${my_conf} $(use_enable pam)"
 
@@ -132,7 +141,7 @@ src_install() {
 	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 failed"
+		/var/spool/fax/bin/{faxrcvd,pollrcvd} || die "dosed failed"
 
 	einfo "Adding env.d entry for Hylafax"
 	newenvd "${FILESDIR}/99hylafax-4.2" 99hylafax