Ebuild cleanup, bug #149377.

Package-Manager: portage-2.1.2_pre1-r4

3 files changed, 54 insertions, 42 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index ee22a4cbb247..fa1a15ec47d8 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.73 2006/09/27 22:47:25 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.74 2006/09/28 10:01:29 nelchael Exp $
+
+  28 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  jabberd-1.4.4-r3.ebuild:
+  Ebuild cleanup, thanks to Paul Bredbury <brebs@sent.com> for help in bug
+  #149377.
 
   27 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   jabberd-1.4.4-r3.ebuild:
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 1c063a7e5ce4..db7224386725 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -92,10 +92,10 @@ EBUILD jabberd-1.4.4-r2.ebuild 4516 RMD160 cb4c97271971d011638f2a768729d7c46d17a
 MD5 b3f6c93ad36ef0b1f5d52185e70e8ad3 jabberd-1.4.4-r2.ebuild 4516
 RMD160 cb4c97271971d011638f2a768729d7c46d17abce jabberd-1.4.4-r2.ebuild 4516
 SHA256 53e77bf72d3dec4a8eea0ffb92a5c72435ce6ae1e5833e57b50dae4f52dbf313 jabberd-1.4.4-r2.ebuild 4516
-EBUILD jabberd-1.4.4-r3.ebuild 2827 RMD160 2bcd8cbf25acb970bfdbfc0d45ce0e5ef300690e SHA1 3243c25c7b311064d9ff43e506c835ac0c554b2c SHA256 ebaa3d04ff1ea1108a5d3ddb9504ae61208291b88020b3f3b4cfbc0b787154ba
-MD5 ec95c5293c93db817843da9b4e42d3eb jabberd-1.4.4-r3.ebuild 2827
-RMD160 2bcd8cbf25acb970bfdbfc0d45ce0e5ef300690e jabberd-1.4.4-r3.ebuild 2827
-SHA256 ebaa3d04ff1ea1108a5d3ddb9504ae61208291b88020b3f3b4cfbc0b787154ba jabberd-1.4.4-r3.ebuild 2827
+EBUILD jabberd-1.4.4-r3.ebuild 3018 RMD160 6961ec453f8d1126818569431ea4793f73b87fef SHA1 d6038ad5d7a7908a352a0d46a70189729bbaf601 SHA256 4e4084bca093e2a114fed0836ace87960e1221229ea5000cdd1806953d9e01a3
+MD5 dc952e08fce4f1e3ec6b4b83a268c312 jabberd-1.4.4-r3.ebuild 3018
+RMD160 6961ec453f8d1126818569431ea4793f73b87fef jabberd-1.4.4-r3.ebuild 3018
+SHA256 4e4084bca093e2a114fed0836ace87960e1221229ea5000cdd1806953d9e01a3 jabberd-1.4.4-r3.ebuild 3018
 EBUILD jabberd-2.0.10.ebuild 3494 RMD160 a43d71c49628084c41d02767775c3dde4898018d SHA1 8c5cad380f1c00395dc4ad7d5b3aa4f0e80f4703 SHA256 1cdeac08668b8d609b335f42d8e6c77f8152398f5b940935d2c64678039e6480
 MD5 fb4eb4f8f7c47229416f97a92b0d99d1 jabberd-2.0.10.ebuild 3494
 RMD160 a43d71c49628084c41d02767775c3dde4898018d jabberd-2.0.10.ebuild 3494
@@ -108,10 +108,10 @@ EBUILD jabberd-2.0.9.ebuild 3622 RMD160 249ec6cd2b563d6e3733f44074acb48efa3e817b
 MD5 4cfba42324bea977951cd322a4299d77 jabberd-2.0.9.ebuild 3622
 RMD160 249ec6cd2b563d6e3733f44074acb48efa3e817b jabberd-2.0.9.ebuild 3622
 SHA256 44fad28beb56c42295a9bd4d0b14dafbdab94be0f9114b34b18d235ecb2f0dbe jabberd-2.0.9.ebuild 3622
-MISC ChangeLog 11763 RMD160 5f82d5c19932780c49b3d04f10eabfb79f1d4447 SHA1 5886e829c69ce180070b3fb53bfae7b9325d2f39 SHA256 323c4d2872c6ce05c9bf5dbdc3ee96086e6f4c2fea0c447595be04a0b10399e1
-MD5 c8cfafaab023e97026f84b503f036bf1 ChangeLog 11763
-RMD160 5f82d5c19932780c49b3d04f10eabfb79f1d4447 ChangeLog 11763
-SHA256 323c4d2872c6ce05c9bf5dbdc3ee96086e6f4c2fea0c447595be04a0b10399e1 ChangeLog 11763
+MISC ChangeLog 11930 RMD160 60572500beef298489d2dd982c5d10ddba969f40 SHA1 313287c5328baf17fda9963d62e49a99f2427728 SHA256 6b4efb971e08bf95e24a7d0e993c2e07f2e81b769ec240bbd6952772504d07fd
+MD5 dd4aafca1765e307b8a6f6c67a827870 ChangeLog 11930
+RMD160 60572500beef298489d2dd982c5d10ddba969f40 ChangeLog 11930
+SHA256 6b4efb971e08bf95e24a7d0e993c2e07f2e81b769ec240bbd6952772504d07fd ChangeLog 11930
 MISC metadata.xml 453 RMD160 bd3a0ba0e9aa3e1652489c731ff97d97ad050bc7 SHA1 74ce3349255a107d4ec18bc3e9639a50b8e7cdbe SHA256 b21a9806e3be38cc94ca812e9864c537237905bdb18347461fae9ba26bb1f690
 MD5 e07ef3d6fc255eee85b6dd3480c8f819 metadata.xml 453
 RMD160 bd3a0ba0e9aa3e1652489c731ff97d97ad050bc7 metadata.xml 453
@@ -140,7 +140,7 @@ SHA256 e0558a17b5746d48015656ba100b8c828968a785ad35c728696b79c54cd28922 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFGv+Ngo/w9rxVVVERAupHAKCS4AC0TqTerRbbsD1pguaIh7jD/ACdHVES
-QEJsHZF3AQnLoRpEUsfznVk=
-=ldC7
+iD8DBQFFG52Kgo/w9rxVVVERAjjiAJ9gUSBg37dMoshOncv4HVdigqI7swCfRM/H
+dGf6f39jdCDuL4n5H4fO0Uo=
+=LHFZ
 -----END PGP SIGNATURE-----
diff --git a/net-im/jabberd/jabberd-1.4.4-r3.ebuild b/net-im/jabberd/jabberd-1.4.4-r3.ebuild
index c0abfc0602f1..a068999f9f0c 100644
--- a/net-im/jabberd/jabberd-1.4.4-r3.ebuild
+++ b/net-im/jabberd/jabberd-1.4.4-r3.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.2 2006/09/27 22:47:25 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.3 2006/09/28 10:01:29 nelchael Exp $
 
 inherit eutils
 
-S="${WORKDIR}/jabberd-${PV}"
-DESCRIPTION="Open Source Jabber Server"
+DESCRIPTION="Open-source Jabber server"
 HOMEPAGE="http://www.jabber.org"
 SRC_URI="http://download.jabberd.org/jabberd14/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="ssl ipv6 mysql postgres"
+IUSE="debug ipv6 mysql postgres ssl"
 
+# Block against jabberd-2* is needed - both packages install the same files.
+# jabberd-2* needs to be back at SLOT="0"
 DEPEND=">=net-im/jabber-base-0.01
 	>=dev-libs/pth-1.4.0
 	dev-libs/expat
@@ -23,9 +24,6 @@ DEPEND=">=net-im/jabber-base-0.01
 	!net-im/aim-transport
 	!=net-im/jabberd-2*"
 
-# Block against jabberd-2* is needed - both packages install the same files - collisions!
-# jabberd-2* needs to be back at SLOT="0"
-
 pkg_setup() {
 
 	if use postgres && use mysql; then
@@ -34,8 +32,9 @@ pkg_setup() {
 	fi
 
 	if use ipv6; then
-		ewarn "You are about to build with ipv6 support, if your system is not using ipv6"
-		ewarn "hit Control-C now and emerge with \"USE=-ipv6\" or add it to /etc/portage/package.use "
+		ewarn "Without full ipv6 support, jabberd will show the error:"
+		ewarn '   "mio unable to listen"'
+		ewarn "To fix this, emerge jabberd without the ipv6 USE flag."
 	fi
 
 }
@@ -53,54 +52,62 @@ src_compile() {
 
 	unset LC_ALL LC_CTYPE
 
+	# Broken configure script - can't use "use_enable"
+	local myconf=
+	use debug && myconf="${myconf} --enable-debug"
+	use ipv6  && myconf="${myconf} --enable-ipv6"
+	use ssl   && myconf="${myconf} --enable-ssl"
+
 	econf \
 		--sysconfdir=/etc/jabber \
-		$(use_enable ssl) \
-		$(use_enable ipv6) \
+		${myconf} \
 		$(use_with mysql) \
-		$(use_with postgres postgresql )\
+		$(use_with postgres postgresql) \
 		|| die "econf failed"
 
 	# Broken parallel build
-	emake -j 1 || die
+	emake -j1 || die "emake failed"
 
 }
 
 src_install() {
 
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 
-	newinitd ${FILESDIR}/${P}.init jabber
+	newinitd "${FILESDIR}"/${P}.init jabber || die "newinitd failed"
 
 	# net-im/jabber-base provides needed directories
 	rm -rf "${D}/var"
 	mv "${D}/etc/jabber/jabber.xml" "${D}/etc/jabber/jabberd.xml"
 	mv "${D}/etc/jabber/jabber.xml.dist" "${D}/etc/jabber/jabberd.xml.dist"
+
 	sed -i \
 		-e 's,/var/lib/spool/jabberd,/var/spool/jabber,g' \
 		-e 's,/var/lib/log/jabberd,/var/log/jabber,g' \
 		-e 's,/var/lib/run/jabberd,/var/run/jabber,g' \
 		-e 's,jabber.pid,jabberd14.pid,g' \
-		"${D}/etc/jabber/jabberd.xml" \
-		"${D}/etc/jabber/jabberd.xml.dist"
+		"${D}"/etc/jabber/jabberd.xml{,.dist} \
+		|| die "sed failed"
 
 }
 
 pkg_postinst() {
 
-	einfo "The various IM transports for jabber are now separate packages,"
-	einfo "which you will need to install separately if you want them:"
-	einfo "net-im/jit - ICQ transport"
-	einfo "net-im/pymsn-t - MSN transport"
-	einfo "net-im/jud - Jabber User Directory"
-	einfo "net-im/yahoo-transport - Yahoo IM system"
-	einfo "net-im/mu-conference - Jabber multi user conference"
-	einfo
-	ewarn "If upgrading from older version please stop jabberd BEFORE updating the init.d"
-	ewarn "script, or you will end with a \"dead\" server."
-	ewarn
-	ewarn "Configuration file name has changed:"
-	ewarn "    configure your server in /etc/jabber/jabberd.xml!"
+	echo
+	einfo 'The various IM transports for jabber are now separate packages,'
+	einfo 'which you will need to install separately if you want them:'
+	einfo '   net-im/jit - ICQ transport'
+	einfo '   net-im/pymsn-t - MSN transport'
+	einfo '   net-im/jud - Jabber User Directory'
+	einfo '   net-im/yahoo-transport - Yahoo IM system'
+	einfo '   net-im/mu-conference - Jabber multi user conference'
+	echo
+	ewarn 'If upgrading from an older version, please stop jabberd BEFORE'
+	ewarn 'updating the init.d script, or you will end with a "dead" server.'
+	echo
+	ewarn 'The configuration filename has changed:'
+	ewarn '   Configure your server in /etc/jabber/jabberd.xml'
+	echo
 	ebeep
 
 }