Version bump, adding manpages, make the plugins dir cleanup message conditional. Clean up old version.

(Portage version: 2.1.2-r12)

4 files changed, 23 insertions, 8 deletions

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index 237e4372f708..63b52497bf6c 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/pkgcore
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.18 2007/02/19 21:02:30 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.19 2007/03/04 03:23:52 marienz Exp $
+
+*pkgcore-0.2.6 (04 Mar 2007)
+
+  04 Mar 2007; Marien Zwart <marienz@gentoo.org> -pkgcore-0.2.4.ebuild,
+  +pkgcore-0.2.6.ebuild:
+  Version bump, adding manpages, make the plugins dir cleanup message
+  conditional. Clean up old version.
 
 *pkgcore-0.2.5 (19 Feb 2007)
 
diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.2.4 b/sys-apps/pkgcore/files/digest-pkgcore-0.2.4
deleted file mode 100644
index e7237d7badd9..000000000000
--- a/sys-apps/pkgcore/files/digest-pkgcore-0.2.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4b53e3a5641c2b65b18bdc7b683f054c pkgcore-0.2.4.tar.bz2 516569
-RMD160 14c8c11b384033fddb4273a06794f847e81e2320 pkgcore-0.2.4.tar.bz2 516569
-SHA256 f78ccf394105a5ce7587c953cd5b7648138ca33dae6459a38e593cb99e379ce7 pkgcore-0.2.4.tar.bz2 516569
diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.2.6 b/sys-apps/pkgcore/files/digest-pkgcore-0.2.6
new file mode 100644
index 000000000000..a31712ce0fe4
--- /dev/null
+++ b/sys-apps/pkgcore/files/digest-pkgcore-0.2.6
@@ -0,0 +1,3 @@
+MD5 8e814f7f76b986311c942ba0f1256221 pkgcore-0.2.6.tar.bz2 548824
+RMD160 6887e954b67bd7c067f5c15b2ffb1c508ba573e8 pkgcore-0.2.6.tar.bz2 548824
+SHA256 86fba16652beb80697d6bae70f82237b716e83d2bea74ad8979e3f0922beda6b pkgcore-0.2.6.tar.bz2 548824
diff --git a/sys-apps/pkgcore/pkgcore-0.2.4.ebuild b/sys-apps/pkgcore/pkgcore-0.2.6.ebuild
index a8b2f9cb30cb..48abe56fde2e 100644
--- a/sys-apps/pkgcore/pkgcore-0.2.4.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.2.4.ebuild,v 1.1 2007/02/16 17:51:51 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.2.6.ebuild,v 1.1 2007/03/04 03:23:52 marienz Exp $
 
 inherit distutils
 
@@ -19,6 +19,8 @@ RDEPEND=">=dev-lang/python-2.4
 	>=app-shells/bash-3.0
 	doc? ( >=dev-python/docutils-0.4 )"
 
+DOCS="AUTHORS NEWS"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -30,6 +32,9 @@ src_compile() {
 
 	if use doc; then
 		./build_docs.py || die "doc building failed"
+		for f in man/*.man; do
+			mv "${f}" "${f/%man/1}" || die "${f} manpage rename failed"
+		done
 	fi
 }
 
@@ -38,9 +43,10 @@ src_install() {
 
 	if use doc; then
 		dohtml -r doc dev-notes
+		doman man/*.1
 	fi
 
-	dodoc doc/*.rst
+	dodoc doc/*.rst man/*.rst
 	docinto dev-notes
 	dodoc dev-notes/*.rst
 }
@@ -50,8 +56,10 @@ pkg_postinst() {
 	echo "updating pkgcore plugin cache"
 	pplugincache
 
-	elog "If you still have an /etc/pkgcore/plugins directory from pkgcore 0.1"
-	elog "you can remove it now."
+	if [[ -d "${ROOT}etc/pkgcore/plugins" ]]; then
+		elog "You still have an /etc/pkgcore/plugins from pkgcore 0.1."
+		elog "It is unused by pkgcore >= 0.2, so you can remove it now."
+	fi
 }
 
 src_test() {