Version bump, bug #152446

(Portage version: 2.1.2.8)

5 files changed, 35 insertions, 44 deletions

diff --git a/www-apps/nanoblogger/ChangeLog b/www-apps/nanoblogger/ChangeLog
index 324b2d387d9e..98214be204fa 100644
--- a/www-apps/nanoblogger/ChangeLog
+++ b/www-apps/nanoblogger/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/nanoblogger
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/ChangeLog,v 1.23 2007/03/19 01:07:31 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/ChangeLog,v 1.24 2007/06/03 19:48:40 rl03 Exp $
+
+*nanoblogger-3.3 (03 Jun 2007)
+
+  03 Jun 2007; Renat Lumpau <rl03@gentoo.org>
+  -files/nanoblogger-3.1-fix-rss2.diff, -nanoblogger-3.1-r3.ebuild,
+  +nanoblogger-3.3.ebuild:
+  Version bump, bug #152446
 
   19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove ka0ttic from metadata.xml due to retirement.
diff --git a/www-apps/nanoblogger/files/digest-nanoblogger-3.1-r3 b/www-apps/nanoblogger/files/digest-nanoblogger-3.1-r3
deleted file mode 100644
index d4064efea593..000000000000
--- a/www-apps/nanoblogger/files/digest-nanoblogger-3.1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7b8eba52ded4849953c88f1747b97f9d nanoblogger-3.1.tar.gz 51293
-RMD160 e51fea6196dadebbde7bb68ae844a36e33c561b7 nanoblogger-3.1.tar.gz 51293
-SHA256 76d396d0516a7c523cf705082de09b04e4a5115cf4ebc94755b39170f248a92a nanoblogger-3.1.tar.gz 51293
diff --git a/www-apps/nanoblogger/files/digest-nanoblogger-3.3 b/www-apps/nanoblogger/files/digest-nanoblogger-3.3
new file mode 100644
index 000000000000..e4e5c9d4183d
--- /dev/null
+++ b/www-apps/nanoblogger/files/digest-nanoblogger-3.3
@@ -0,0 +1,3 @@
+MD5 c9df242e48be0c9b7fca2443c00fd6dc nanoblogger-3.3.tar.gz 82302
+RMD160 2d960a128aac1676c308e37de5cce07aacef6674 nanoblogger-3.3.tar.gz 82302
+SHA256 b49b25ee18c42dc9cf47fdd456e5dd19033456c64104a0ccba34e318e5daf1a0 nanoblogger-3.3.tar.gz 82302
diff --git a/www-apps/nanoblogger/files/nanoblogger-3.1-fix-rss2.diff b/www-apps/nanoblogger/files/nanoblogger-3.1-fix-rss2.diff
deleted file mode 100644
index 9073f8996ad1..000000000000
--- a/www-apps/nanoblogger/files/nanoblogger-3.1-fix-rss2.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- plugins/rss2.sh	2004/12/10 06:11:56	1.2
-+++ plugins/rss2.sh	2005/01/03 19:44:31	1.3
-@@ -27,8 +27,8 @@
- make_rssfeed(){
- 	feed_outfile="$1"
- 	MKPAGE_OUTFILE="$feed_outfile"
--	RSS2_FEED_URL="$BLOG_URL/$NB_RSS2File"
--	[ ! -z "$NB_RSS2CatFile" ] && RSS2_FEED_URL="$BLOG_URL/$ARCHIVES_DIR/$NB_RSS2CatFile"
-+	BLOG_FEED_URL="$BLOG_URL"
-+	[ ! -z "$NB_ArchiveFile" ] && BLOG_FEED_URL="$BLOG_URL/$ARCHIVES_DIR/$NB_ArchiveFile"
- 
- 	cat > "$MKPAGE_OUTFILE" <<-EOF
- 		<?xml version="1.0" encoding="$BLOG_CHARSET"?>
-@@ -39,7 +39,7 @@
- 		>
- 		<channel>
- 			<title>$BLOG_TITLE</title>
--			<link>$RSS2_FEED_URL</link>
-+			<link>$BLOG_FEED_URL</link>
- 			<description>$BLOG_DESCRIPTION</description>
- 			<dc:language>$BLOG_LANG</dc:language>
- 			<dc:creator>$NB_EntryAuthor</dc:creator>
-@@ -102,6 +102,7 @@
- 				if [ -f "$NB_DATA_DIR/$cat_db" ]; then
- 					#NB_RSS2CatFile=`chg_suffix "$cat_db" "$NB_SYND_FILETYPE"`
- 					NB_RSS2CatFile=`echo "$cat_db" |sed -e 's/[\.]db/-rss.'$NB_SYND_FILETYPE'/g'`
-+					NB_ArchiveFile=`chg_suffix "$cat_db" "$NB_FILETYPE"`
- 					NB_ArchiveTitle=`sed 1q "$NB_DATA_DIR/$cat_db" |esc_chars`
- 					nb_msg "generating rss $NB_RSS2Ver feed for category ..."
- 					build_rssfeed "$cat_db"
diff --git a/www-apps/nanoblogger/nanoblogger-3.1-r3.ebuild b/www-apps/nanoblogger/nanoblogger-3.3.ebuild
index c04774ca749a..2d011026545b 100644
--- a/www-apps/nanoblogger/nanoblogger-3.1-r3.ebuild
+++ b/www-apps/nanoblogger/nanoblogger-3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/nanoblogger-3.1-r3.ebuild,v 1.6 2006/07/09 21:02:08 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/nanoblogger-3.3.ebuild,v 1.1 2007/06/03 19:48:40 rl03 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/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~x86"
 IUSE=""
 
 RDEPEND="app-shells/bash"
@@ -19,17 +19,16 @@ 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|" \
+		-e 's|^\(NB_BASE_DIR=\).*$|\1"/usr/share/nanoblogger"|' \
+		-e 's|^\(NB_CFG_DIR=\).*$|\1"/etc"|' \
+		-e "s|\$NB_BASE_DIR.*\(nano.*html\)|/usr/share/doc/${PF}/html/\1|" \
 			nb || die "sed nb failed"
-	epatch ${FILESDIR}/${P}-fix-rss2.diff
 }
 
 src_install() {
 	dobin nb
 	insinto /usr/share/nanoblogger
-	doins -r default moods plugins
+	doins -r default moods plugins lib lang docs welcome-to-nb.txt
 	insinto /etc
 	doins nb.conf
 	dodoc ChangeLog
@@ -38,7 +37,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
+	elog
 	elog "Documentation for getting started with nanoblogger may be found at"
 	elog "/usr/share/doc/${PF}/html/nanoblogger.html or by running 'nb --manual;."
 	elog
@@ -50,5 +49,20 @@ pkg_postinst() {
 	elog "nanoblogger (with the -b switch), you can set a default value in your"
 	elog "~/.nb.conf.  For example:"
 	elog '   BLOG_DIR="$HOME/public_html/blog"'
+	elog
+	elog "If you are upgrading nanoblogger from a previous version, follow"
+	elog "these directions (as stated in the manual):"
+	elog "    1. create a new weblog directory using nanoblogger (skip configuration):"
+	elog "      nb [-b blog_dir] -a"
+	elog "    2. copy old data directry to new weblog:"
+	elog "      cp -r [old_blog_dir]/data [newblog_dir]"
+	elog "    3. edit new blog.conf to your liking and rebuild weblog:"
+	elog "      nb [-b blog_dir] --configure -u all"
+	elog
+	elog "You also should remove your [newblog_dir]/data/cat_1.db and run:"
+	elog "		nb -u all"
+	elog "after copying your old entries from [oldblog_dir]/data to"
+	elog "[newblog_dir]/data."
+	elog
 	bash-completion_pkg_postinst
 }