Version bump for bug 96617. Tidy'd old ebuilds/patches.

(Portage version: 2.0.51.22-r1)

9 files changed, 15 insertions, 107 deletions

diff --git a/www-apps/nanoblogger/ChangeLog b/www-apps/nanoblogger/ChangeLog
index 7936584d70d6..1a0a44bdad4c 100644
--- a/www-apps/nanoblogger/ChangeLog
+++ b/www-apps/nanoblogger/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/nanoblogger
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/ChangeLog,v 1.12 2005/06/20 05:54:26 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/ChangeLog,v 1.13 2005/06/23 10:34:31 ka0ttic Exp $
+
+*nanoblogger-3.2.3 (23 Jun 2005)
+
+  23 Jun 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/nanoblogger-3.2.2-fix-add-option.diff,
+  -files/nanoblogger-3.2.2-fix-misplaced-dirs.diff, -nanoblogger-3.2.ebuild,
+  -nanoblogger-3.2.2.ebuild, +nanoblogger-3.2.3.ebuild:
+  Version bump for bug 96617. Tidy'd old ebuilds/patches.
 
 *nanoblogger-3.2.2 (20 Jun 2005)
 
diff --git a/www-apps/nanoblogger/Manifest b/www-apps/nanoblogger/Manifest
index 167e9ff2e560..f5330aea8056 100644
--- a/www-apps/nanoblogger/Manifest
+++ b/www-apps/nanoblogger/Manifest
@@ -1,22 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d2ce9cb0d00db92bc1f0e77340d2e167 nanoblogger-3.2.2.ebuild 2234
 MD5 710ea825b46bd4aef363b4f0c334d9a1 nanoblogger-3.1-r3.ebuild 1670
-MD5 a3be6f050940ed564cc06a7d728c601a nanoblogger-3.2.ebuild 1632
-MD5 066464cac2bdaa2a771955714605e98d ChangeLog 2006
+MD5 f8193e6bacfca6ccc3da17cd31225264 nanoblogger-3.2.3.ebuild 2132
+MD5 ef71a368b00e144bcae0e9871e33ee50 ChangeLog 2329
 MD5 c08d190785ce2e73bba9042c2decf264 metadata.xml 1082
-MD5 b3aeb2c12ec202511efdeba55fcf4b7f files/nanoblogger-3.2.2-fix-misplaced-dirs.diff 471
-MD5 3603c3e99210052ce503e98d20f63806 files/digest-nanoblogger-3.2 66
 MD5 1c213e50a94f5d19d1aa1fb5edd93721 files/nb.bashcomp 1389
 MD5 1ab32e1e0e5fef5232ec0b69d002f8eb files/digest-nanoblogger-3.1-r3 66
-MD5 b47aeb3b2f8cc614e2deb398c806086b files/digest-nanoblogger-3.2.2 68
-MD5 d09c43535f9f25c9d7fc4dff1f6ebf73 files/nanoblogger-3.2.2-fix-add-option.diff 472
+MD5 bb5cc01bfa66d2134acce3a791a21f16 files/digest-nanoblogger-3.2.3 68
 MD5 67755be92a7c9db9f65d470a5bd5cc6f files/nanoblogger-3.1-fix-rss2.diff 1204
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCtlohEZCkKN40op4RAmaBAKC0GvmdvjGkePT1eMCgrqYuT1qkYgCfXTuf
-uXPrcVYfeP0xWFYZxkHx7kA=
-=UpJR
------END PGP SIGNATURE-----
diff --git a/www-apps/nanoblogger/files/digest-nanoblogger-3.2 b/www-apps/nanoblogger/files/digest-nanoblogger-3.2
deleted file mode 100644
index c27de60d485a..000000000000
--- a/www-apps/nanoblogger/files/digest-nanoblogger-3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6183fcbafb7f5061b48d08fc1e2f424a nanoblogger-3.2.tar.gz 56326
diff --git a/www-apps/nanoblogger/files/digest-nanoblogger-3.2.2 b/www-apps/nanoblogger/files/digest-nanoblogger-3.2.2
deleted file mode 100644
index d3e12c6c1ae1..000000000000
--- a/www-apps/nanoblogger/files/digest-nanoblogger-3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 647656af7bc91aee8bfc009a8337238f nanoblogger-3.2.2.tar.gz 54679
diff --git a/www-apps/nanoblogger/files/digest-nanoblogger-3.2.3 b/www-apps/nanoblogger/files/digest-nanoblogger-3.2.3
new file mode 100644
index 000000000000..31b10c77e309
--- /dev/null
+++ b/www-apps/nanoblogger/files/digest-nanoblogger-3.2.3
@@ -0,0 +1 @@
+MD5 bd9f5f9d48b9b666f7bd03c76d90a724 nanoblogger-3.2.3.tar.gz 54672
diff --git a/www-apps/nanoblogger/files/nanoblogger-3.2.2-fix-add-option.diff b/www-apps/nanoblogger/files/nanoblogger-3.2.2-fix-add-option.diff
deleted file mode 100644
index 31a7c7318ba9..000000000000
--- a/www-apps/nanoblogger/files/nanoblogger-3.2.2-fix-add-option.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- nb	2005-06-20 06:23:04.000000000 +0100
-+++ nb	2005-06-20 06:18:56.000000000 +0100
-@@ -1064,7 +1064,6 @@
- if [ ! -d "$BLOG_DIR" ]; then
- 	nb_msg "creating weblog directory '$BLOG_DIR' ..."
- 	mkdir -p "$BLOG_DIR"
--fi
- if [ -d "$BLOG_DIR" ]; then
- 	> "$BLOG_DIR/.nb_new_weblog"
- 	nb_msg "copying default weblog files ..."
-@@ -1091,6 +1090,7 @@
- else
- 	die "failed to create weblog directory!"
- fi
-+fi
- check_config
- # create a new category 
- if [ ! -z "$cat_num" ]; then
diff --git a/www-apps/nanoblogger/files/nanoblogger-3.2.2-fix-misplaced-dirs.diff b/www-apps/nanoblogger/files/nanoblogger-3.2.2-fix-misplaced-dirs.diff
deleted file mode 100644
index c5461ba64da9..000000000000
--- a/www-apps/nanoblogger/files/nanoblogger-3.2.2-fix-misplaced-dirs.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- nb	2005-06-20 05:21:40.000000000 +0100
-+++ nb	2005-06-20 05:23:20.000000000 +0100
-@@ -1075,7 +1075,7 @@
- 	done
- 	# create some critical empty directories
- 	for weblog_emptydir in "$ARCHIVES_DIR" "$CACHE_DIR" "$PARTS_DIR"; do
--		[ ! -d "$weblog_emptydir" ] && mkdir "$weblog_emptydir"
-+		[ ! -d "$BLOG_DIR/$weblog_emptydir" ] && mkdir "$BLOG_DIR/$weblog_emptydir"
- 	done
- 	# but prompt for configuration.
- 	echo "would you like to configure the new weblog now? [Y/n]"
diff --git a/www-apps/nanoblogger/nanoblogger-3.2.2.ebuild b/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild
index 45138425e07f..172b47a6fa39 100644
--- a/www-apps/nanoblogger/nanoblogger-3.2.2.ebuild
+++ b/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/nanoblogger-3.2.2.ebuild,v 1.1 2005/06/20 05:54:26 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild,v 1.1 2005/06/23 10:34:31 ka0ttic Exp $
 
-inherit bash-completion eutils
+inherit bash-completion
 
 DESCRIPTION="Small and simple weblog engine written in Bash for the command-line"
 HOMEPAGE="http://nanoblogger.sourceforge.net/"
@@ -23,9 +23,6 @@ src_unpack() {
 		-e 's|"$NB_BASE_DIR/\(nb\.conf\)"|"/etc/\1"|g' \
 		-e "s|\$NB_BASE_DIR.*\(nano.*html\)|/usr/share/doc/${PF}/html/\1|" \
 			nb || die "sed nb failed"
-
-	epatch ${FILESDIR}/${P}-fix-misplaced-dirs.diff
-	epatch ${FILESDIR}/${P}-fix-add-option.diff
 }
 
 src_install() {
diff --git a/www-apps/nanoblogger/nanoblogger-3.2.ebuild b/www-apps/nanoblogger/nanoblogger-3.2.ebuild
deleted file mode 100644
index 825a524c10ea..000000000000
--- a/www-apps/nanoblogger/nanoblogger-3.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/nanoblogger-3.2.ebuild,v 1.2 2005/06/08 08:45:46 dholm Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="Small and simple weblog engine written in Bash for the command-line"
-HOMEPAGE="http://nanoblogger.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="app-shells/bash"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e 's|^\(BASE_DIR=\).*$|\1"/usr/share/nanoblogger"|' \
-		-e 's|"$BASE_DIR"/\(nb\.conf\)|/etc/\1|' \
-		-e "s|\$BASE_DIR.*\(nano.*html\)|/usr/share/doc/${PF}/html/\1|" \
-			nb || die "sed nb failed"
-}
-
-src_install() {
-	dobin nb
-	insinto /usr/share/nanoblogger
-	doins -r default moods plugins
-	insinto /etc
-	doins nb.conf
-	dodoc ChangeLog
-	dohtml docs/nanoblogger.html
-	dobashcompletion ${FILESDIR}/nb.bashcomp
-}
-
-pkg_postinst() {
-	echo
-	einfo "Documentation for getting started with nanoblogger may be found at"
-	einfo "/usr/share/doc/${PF}/html/nanoblogger.html or by running 'nb --manual;."
-	einfo
-	einfo "To create and configure a new weblog, run the following as your user:"
-	einfo "   nb -b /some/dir -a"
-	einfo "where /some/dir is a directory that DOES NOT exist."
-	einfo
-	einfo "To prevent having to specify your blog directory every time you use"
-	einfo "nanoblogger (with the -b switch), you can set a default value in your"
-	einfo "~/.nb.conf.  For example:"
-	einfo '   BLOG_DIR="$HOME/public_html/blog"'
-	bash-completion_pkg_postinst
-}