Fix pkg_config. Make it more verbose.

Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

3 files changed, 30 insertions, 37 deletions

diff --git a/net-nntp/inn/ChangeLog b/net-nntp/inn/ChangeLog
index 64940027811d..65b3f42972b3 100644
--- a/net-nntp/inn/ChangeLog
+++ b/net-nntp/inn/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-nntp/inn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.38 2011/08/06 03:01:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/ChangeLog,v 1.39 2011/08/06 03:27:10 jer Exp $
+
+  06 Aug 2011; Jeroen Roovers <jer@gentoo.org> inn-2.5.2-r1.ebuild:
+  Fix pkg_config. Make it more verbose.
 
 *inn-2.5.2-r1 (06 Aug 2011)
 
diff --git a/net-nntp/inn/Manifest b/net-nntp/inn/Manifest
index 7ff205d047d8..a8231e7834b7 100644
--- a/net-nntp/inn/Manifest
+++ b/net-nntp/inn/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 AUX innd 503 RMD160 5631966614d5bb4e1c304195e1e796a1fbc9421e SHA1 85aa86e4fcca7837e32e2e3be31fbd50e96b79c2 SHA256 ab2082ee261d632dafeaaf9ebb459e5afe684597c67b860ca0a7a8ff3bf554ed
 DIST inn-2.5.2.tar.gz 2331916 RMD160 2fce7fade8bd8df3fe7f813b6feb37ff2b2bf07c SHA1 e7a9512acb5fa09ecdf116a4bde39c9f5efe65db SHA256 f5edd48f48ecee9b6430db94fe504f893d7dfae4257f55f382ba1cf7375b4e68
-EBUILD inn-2.5.2-r1.ebuild 8296 RMD160 121da26a30d7bcea274cbae7827cb0ee5f18c06d SHA1 50c120ea90dde9e1697a6c718e8b3e0f62328473 SHA256 0475fbeacb9074f56045e28cb85a3a9924c406a025865489de77fda2b2bc2edb
+EBUILD inn-2.5.2-r1.ebuild 8207 RMD160 eca2b3e3089a4387922131bb58e47f4656e35cc0 SHA1 9e662aecb24a77771a2b49673befbc7ad8dca32b SHA256 1d48e569d12de9ef77d580d5a746872539ff6b705e7893cb68f0432d7a1751f6
 EBUILD inn-2.5.2.ebuild 8015 RMD160 4a37c5d5589b4f93440e4721dd80eda0ca14b0a9 SHA1 a29dff7239c331972cf10d077f7f10122c74b473 SHA256 571730ba03b8c7c4ac800e1a32c5d701b5621893a7cec7e40ad50a08086b64bd
-MISC ChangeLog 8246 RMD160 97f018328a7a41613f2457cb1411db5422095275 SHA1 b0faa3d3a6663df1c7f8dd6b6f99f2073bd24d7c SHA256 c2ab777e592bc0febae6515e97ca36423fe871df741769f8a2009bf381facba5
+MISC ChangeLog 8355 RMD160 adab9f91dd25bca135a12402cd5897fb355b841b SHA1 1d40f2a5f7c800ef7076fead96f06c5a7b1ae25b SHA256 c94497b99bf219f03b752c975b3f9a604087034882619f18e18ab6a1b990275d
 MISC metadata.xml 352 RMD160 802eed9c30b34a5226648155bf521f9fd3bef350 SHA1 230d40e31eb709966710ca40e489ad00962c80bb SHA256 c58a5ed6da2054c42c3e7a6328456cedbdc45664210a95223fdd18a0fec340ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk48rpYACgkQVWmRsqeSphNKqQCfcGG4Kuot7qZAlQm7CVyxxmZ2
-J/IAn1Rubrd1kDW1+Sh1OKGOuSUD7S69
-=SzdN
+iEYEARECAAYFAk48tJQACgkQVWmRsqeSphMu7ACeNFuLFEjVe+xUkmqLstxTJyEc
+OsEAn2WsgQjU+Gg3ehLIksemC/3v0HRO
+=oZln
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/inn/inn-2.5.2-r1.ebuild b/net-nntp/inn/inn-2.5.2-r1.ebuild
index 036585394b39..0b7ae9c9f03d 100644
--- a/net-nntp/inn/inn-2.5.2-r1.ebuild
+++ b/net-nntp/inn/inn-2.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.2-r1.ebuild,v 1.1 2011/08/06 03:01:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/inn/inn-2.5.2-r1.ebuild,v 1.2 2011/08/06 03:27:10 jer Exp $
 
 EAPI="4"
 
@@ -172,55 +172,49 @@ pkg_postrm() {
 
 pkg_config() {
 	NEWSSPOOL_DIR="${ROOT}/var/spool/news"
-	NEWS_SHELL="`awk -F':' '/^news:/ {print $7;}' ${ROOT}/etc/passwd`"
+	NEWS_SHELL="$( awk -F':' '/^news:/ {print $7;}' ${ROOT}/etc/passwd )"
 	NEWS_ERRFLAG="0"
 
-	if [[ ${NEWS_SHELL} == /bin/false || ${NEWS_SHELL} == /dev/null ]]
-	then
-		if [ ${UID} -eq 0 ]
-		then
-			einfo "Changing shell to /bin/bash for user news..."
-			usermod -s /bin/bash news
-		else
-			NEWS_ERRFLAG=1
-			eerror
-			eerror "Could not change shell for user news."
-			eerror "Please run 'usermod -s /bin/bash news' as root."
-		fi
+	if [[ ${NEWS_SHELL} == /bin/false || ${NEWS_SHELL} == /dev/null ]]; then
+		einfo "Changing shell to /bin/bash for user news..."
+		usermod -s /bin/bash news
 	else
 		einfo "Shell for user news unchanged ('${NEWS_SHELL}')."
-		if [[ ${NEWS_SHELL} != /bin/sh && ${NEWS_SHELL} != /bin/bash ]]
-		then
+		if [[ ${NEWS_SHELL} != /bin/sh && ${NEWS_SHELL} != /bin/bash ]]; then
 			ewarn "You might want to change it to '/bin/bash', though."
 		fi
 	fi
 
-	if [[ ! -e ${NEWSSPOOL_DIR}/db/history ]]
-	then
+	if [[ ! -e ${NEWSSPOOL_DIR}/db/history ]]; then
 		if [[ ! -f ${NEWSSPOOL_DIR}/db/history.dir \
 			&& ! -f ${NEWSSPOOL_DIR}/db/history.pag \
 			&& ! -f ${NEWSSPOOL_DIR}/db/history.hash \
 			&& ! -f ${NEWSSPOOL_DIR}/db/history.index ]]
 		then
-			einfo "Building history database..."
+			einfo "Building history database ..."
 
 			touch "${NEWSSPOOL_DIR}"/db/history
 			chown news:news "${NEWSSPOOL_DIR}"/db/history
 			chmod 644 "${NEWSSPOOL_DIR}"/db/history
 
+			einfo "Running makedbz -i ..."
 			su - news -c "/usr/$(get_libdir)/news/bin/makedbz -i"
+
+			einfo "Moving files into place ..."
 			[[ -f ${NEWSSPOOL_DIR}/db/history.n.dir ]] && \
-				mv -f "${NEWSSPOOL_DIR}"/db/history.n.dir \
+				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.dir \
 				"${NEWSSPOOL_DIR}"/db/history.dir
 			[[ -f ${NEWSSPOOL_DIR}/db/history.n.pag ]] && \
-				mv -f "${NEWSSPOOL_DIR}"/db/history.n.pag \
+				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.pag \
 				"${NEWSSPOOL_DIR}"/db/history.pag
 			[[ -f ${NEWSSPOOL_DIR}/db/history.n.hash ]] && \
-				mv -f "${NEWSSPOOL_DIR}"/db/history.n.hash \
+				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.hash \
 				"${NEWSSPOOL_DIR}"/db/history.hash
 			[[ -f ${NEWSSPOOL_DIR}/db/history.n.index ]] && \
-				mv -f "${NEWSSPOOL_DIR}"/db/history.n.index \
+				mv -vf "${NEWSSPOOL_DIR}"/db/history.n.index \
 				"${NEWSSPOOL_DIR}"/db/history.index
+
+			einfo "Running makehistory ..."
 			su - news -c /usr/$(get_libdir)/news/bin/makehistory
 		else
 			NEWS_ERRFLAG="1"
@@ -236,14 +230,12 @@ pkg_config() {
 	fi
 
 	INNCFG_INODES=$(
-		sed -e '/innwatchspoolnodes/ ! d' | \
-		sed -e 's/[^ ]*[ ]*\([^ ]*\)/\1/' \
-		/etc/news/inn.conf
+		sed -e '/innwatchspoolnodes/ ! d' /etc/news/inn.conf |
+			sed -e 's/[^ ]*[ ]*\([^ ]*\)/\1/' \
 	)
 	INNSPOOL_INODES=$(
 		df -Pi ${NEWSSPOOL_DIR} | \
-			sed -e 's/[^ ]*[ ]*\([^ ]*\).*/\1/' | \
-			sed -e '1 d'
+			sed -e 's/[^ ]*[ ]*\([^ ]*\).*/\1/' | sed -e '1 d'
 	)
 	if [[ ${INNCFG_INODES} -gt ${INNSPOOL_INODES} ]]; then
 		ewarn "Setting innwatchspoolinodes to zero, because the filesystem behind"
@@ -268,13 +260,11 @@ pkg_config() {
 	fi
 
 	if [[ ${NEWS_ERRFLAG} -gt 0 ]]; then
-		eerror
 		eerror "There were one or more errors/warnings checking your"
 		eerror "configuration. Please read inn's documentation and"
 		eerror "fix them accordingly."
 	else
-		einfo
-		einfo "Inn configuration tests passed successfully."
+		einfo "INN configuration tests passed successfully."
 		ewarn "Please ensure you have configured inn properly."
 	fi
 }