Version bump, bug #152446

Package-Manager: portage-2.1.2.8

6 files changed, 51 insertions, 64 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/Manifest b/www-apps/nanoblogger/Manifest
index 4f80c6e8db9f..bf58ac5c8738 100644
--- a/www-apps/nanoblogger/Manifest
+++ b/www-apps/nanoblogger/Manifest
@@ -1,42 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX nanoblogger-3.1-fix-rss2.diff 1204 RMD160 43d5c8974243153635b60d0fd534c0124cc03395 SHA1 9623f51f4b2831c9e3cea0c83cc36261082f9905 SHA256 415854a491895125e82539ada994cc5a2b922114889b19ab8e94dc57ceefd9a8
-MD5 67755be92a7c9db9f65d470a5bd5cc6f files/nanoblogger-3.1-fix-rss2.diff 1204
-RMD160 43d5c8974243153635b60d0fd534c0124cc03395 files/nanoblogger-3.1-fix-rss2.diff 1204
-SHA256 415854a491895125e82539ada994cc5a2b922114889b19ab8e94dc57ceefd9a8 files/nanoblogger-3.1-fix-rss2.diff 1204
 AUX nb.bashcomp 1389 RMD160 ad1c0c5202993fd39a1c69d95dbd0e9d6e029cad SHA1 8f4a5a0d78f753e0cc534d505990a6a0ea963ac3 SHA256 d3ecc7bdcaaf3404e342a97bd580494e8904a985f73a7be9cac796cc9f885490
 MD5 1c213e50a94f5d19d1aa1fb5edd93721 files/nb.bashcomp 1389
 RMD160 ad1c0c5202993fd39a1c69d95dbd0e9d6e029cad files/nb.bashcomp 1389
 SHA256 d3ecc7bdcaaf3404e342a97bd580494e8904a985f73a7be9cac796cc9f885490 files/nb.bashcomp 1389
-DIST nanoblogger-3.1.tar.gz 51293 RMD160 e51fea6196dadebbde7bb68ae844a36e33c561b7 SHA1 85cbe9e948119460732d023b7f492780bc155842 SHA256 76d396d0516a7c523cf705082de09b04e4a5115cf4ebc94755b39170f248a92a
 DIST nanoblogger-3.2.3.tar.gz 54672 RMD160 d4ff29e44ffe69fd7cd8b690daab2980ba093617 SHA1 9f2f05a5ebf21817b55f76dd0d5310225322d972 SHA256 9b1d51060e9f0f8db7119546c8dbb915c0dd214ed970844705d8738616c9029b
-EBUILD nanoblogger-3.1-r3.ebuild 1653 RMD160 ce64e42e91d34ffc4c887099cc44d533d8379d19 SHA1 3276887eb90d88854f693aa076b3d953a0e3020d SHA256 163a94c8441a4599fa045ef3f4e9331cf876a8ed03fe46214d293bf07190e132
-MD5 cf1e6880221a38fd0cdf0e127c4b8dfe nanoblogger-3.1-r3.ebuild 1653
-RMD160 ce64e42e91d34ffc4c887099cc44d533d8379d19 nanoblogger-3.1-r3.ebuild 1653
-SHA256 163a94c8441a4599fa045ef3f4e9331cf876a8ed03fe46214d293bf07190e132 nanoblogger-3.1-r3.ebuild 1653
+DIST nanoblogger-3.3.tar.gz 82302 RMD160 2d960a128aac1676c308e37de5cce07aacef6674 SHA1 4600a9fe50f4572755499a389715fc7b5eb6d474 SHA256 b49b25ee18c42dc9cf47fdd456e5dd19033456c64104a0ccba34e318e5daf1a0
 EBUILD nanoblogger-3.2.3.ebuild 2118 RMD160 d6655b9715d5bfd4d12ce8028dc4e3faa1721ee9 SHA1 6c41b56d9b510d55e600fe8a401e4459f401694c SHA256 337f334b2f0fd6e8ef748116661b2300d6a54e1a55c82eaedeadc7cde54a58a8
 MD5 78d5175a0975f6c806b5d8228356ffdb nanoblogger-3.2.3.ebuild 2118
 RMD160 d6655b9715d5bfd4d12ce8028dc4e3faa1721ee9 nanoblogger-3.2.3.ebuild 2118
 SHA256 337f334b2f0fd6e8ef748116661b2300d6a54e1a55c82eaedeadc7cde54a58a8 nanoblogger-3.2.3.ebuild 2118
-MISC ChangeLog 3372 RMD160 a6e9cfa77f76d271cfdeee6c49a3a656a38c3791 SHA1 c382eb11695710bc33037531e5ad57ae75dea8f9 SHA256 9563a044accad208c0305f6620f951aaa38d9d00e29f5c2184c4c8f24bae15a0
-MD5 10a971de03f553780b0023fbe0702ff7 ChangeLog 3372
-RMD160 a6e9cfa77f76d271cfdeee6c49a3a656a38c3791 ChangeLog 3372
-SHA256 9563a044accad208c0305f6620f951aaa38d9d00e29f5c2184c4c8f24bae15a0 ChangeLog 3372
+EBUILD nanoblogger-3.3.ebuild 2334 RMD160 f2076e1824442c38ea90056032fa4e44dac6dd7e SHA1 61c785ada86ce35b324d640babe0c2812f1f57fa SHA256 38b6941aa752f14b0d016181fc19bf9a78ac89a9b8d88acc24497ebd77777b73
+MD5 ab9bbeca9a51c3b728c2e2c7ea1f8e6a nanoblogger-3.3.ebuild 2334
+RMD160 f2076e1824442c38ea90056032fa4e44dac6dd7e nanoblogger-3.3.ebuild 2334
+SHA256 38b6941aa752f14b0d016181fc19bf9a78ac89a9b8d88acc24497ebd77777b73 nanoblogger-3.3.ebuild 2334
+MISC ChangeLog 3572 RMD160 bf8086516249ab8126bef8c8390d505b5b34464a SHA1 30b128d6b3f705d4c3508217c0294d9a9910637e SHA256 b47d16af10e0443a840089cd9a9aedd94411160047ef9ba799fd5154beb8341f
+MD5 8b42661a06a4ee95fdaed8bcfdbb3139 ChangeLog 3572
+RMD160 bf8086516249ab8126bef8c8390d505b5b34464a ChangeLog 3572
+SHA256 b47d16af10e0443a840089cd9a9aedd94411160047ef9ba799fd5154beb8341f ChangeLog 3572
 MISC metadata.xml 989 RMD160 dfe1087bed6bcafbe0e502fbb0cd6dcff4fd1d18 SHA1 34103b11cca6deb77e76390aa880e8ddde8fbf27 SHA256 565954ce27ac18909cf7388d41370f1bd06b02adfc883f28e05bfbe8ddaf4a65
 MD5 b7ffe29800ed584987b54f26110a3b92 metadata.xml 989
 RMD160 dfe1087bed6bcafbe0e502fbb0cd6dcff4fd1d18 metadata.xml 989
 SHA256 565954ce27ac18909cf7388d41370f1bd06b02adfc883f28e05bfbe8ddaf4a65 metadata.xml 989
-MD5 73a471ddc93e85c4b4c10dea4006237b files/digest-nanoblogger-3.1-r3 244
-RMD160 dac6686559e35498497c7c285a7407517a550139 files/digest-nanoblogger-3.1-r3 244
-SHA256 1a4d30f9364d239019957be7767c8b02e20bf86553d6dbdf1cdd5c924c86df66 files/digest-nanoblogger-3.1-r3 244
 MD5 dc7a43a318a4871f05fa3a9f9fd0cf5b files/digest-nanoblogger-3.2.3 250
 RMD160 d515d3cc4addf333ac9e89e3c3132e758932c925 files/digest-nanoblogger-3.2.3 250
 SHA256 07a3a4dda118d00553dd05583767c5d1e61e1fe379eaf392243fd9b2b8ace914 files/digest-nanoblogger-3.2.3 250
+MD5 1ec2164b3d29bc7bc15bb3cd7c69fa9f files/digest-nanoblogger-3.3 244
+RMD160 380f6fd7398448d2b10b330afcd436d9c2a9a6aa files/digest-nanoblogger-3.3 244
+SHA256 9a3b2f26a787aad7c5a13a89dc80544829d8f91ed14a149fb66c6d9ba0c0f386 files/digest-nanoblogger-3.3 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFF/eIcugEuf3OQ0akRAoE9AJ90y7ZvKPRrz+4kKA04+4+xkF834gCeI2TU
-GN4K8QA+0LhG79r0wQnC3I0=
-=Ci5q
+iD8DBQFGYxsfEzitwsaoONoRAhjOAJ9f7E/ah0U5bIA7o4PZAjk80iEfYACeIY2A
+zm35GLvzeu6hwbcBO8vXNrw=
+=Yub7
 -----END PGP SIGNATURE-----
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
 }