Revision bump; fixes small bug in rss2 plugin for bug 82453.

Package-Manager: portage-2.0.51.16

5 files changed, 55 insertions, 6 deletions

diff --git a/www-apps/nanoblogger/ChangeLog b/www-apps/nanoblogger/ChangeLog
index a564c8d6c11d..bdd9f7cbf080 100644
--- a/www-apps/nanoblogger/ChangeLog
+++ b/www-apps/nanoblogger/ChangeLog
@@ -1,6 +1,13 @@
 # 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.3 2005/02/01 17:14:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/ChangeLog,v 1.4 2005/02/18 16:17:39 ka0ttic Exp $
+
+*nanoblogger-3.1-r2 (18 Feb 2005)
+
+  18 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/nanoblogger-3.1-fix-rss2.diff, -nanoblogger-3.1-r1.ebuild,
+  +nanoblogger-3.1-r2.ebuild:
+  Revision bump; fixes small bug in rss2 plugin for bug 82453.
 
   01 Feb 2005; Aron Griffis <agriffis@gentoo.org> nanoblogger-3.1-r1.ebuild:
   add ~alpha and ~ia64
diff --git a/www-apps/nanoblogger/Manifest b/www-apps/nanoblogger/Manifest
index e325b1b63cdf..37a0acb76153 100644
--- a/www-apps/nanoblogger/Manifest
+++ b/www-apps/nanoblogger/Manifest
@@ -1,5 +1,16 @@
-MD5 94cf785c1b2a68b746c0eab23a459260 ChangeLog 672
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 224d2ee4304ec0f3cf9c69a6c5ecc35a ChangeLog 917
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 7161844e3d4506e844400842739b7d45 nanoblogger-3.1-r1.ebuild 1523
-MD5 1ab32e1e0e5fef5232ec0b69d002f8eb files/digest-nanoblogger-3.1-r1 66
+MD5 122109d2c96121a6ce5b25bf30613a5e nanoblogger-3.1-r2.ebuild 1568
 MD5 1c213e50a94f5d19d1aa1fb5edd93721 files/nb.bashcomp 1389
+MD5 1ab32e1e0e5fef5232ec0b69d002f8eb files/digest-nanoblogger-3.1-r2 66
+MD5 67755be92a7c9db9f65d470a5bd5cc6f files/nanoblogger-3.1-fix-rss2.diff 1204
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCFhUsEZCkKN40op4RAvFSAKC0poe9Mx2m8Nz9kgDmO64PAkZHCQCgvc7R
+LVjJCTzuMvEi1FfoAg8+CRk=
+=nqaO
+-----END PGP SIGNATURE-----
diff --git a/www-apps/nanoblogger/files/digest-nanoblogger-3.1-r1 b/www-apps/nanoblogger/files/digest-nanoblogger-3.1-r2
index 193625ddb031..193625ddb031 100644
--- a/www-apps/nanoblogger/files/digest-nanoblogger-3.1-r1
+++ b/www-apps/nanoblogger/files/digest-nanoblogger-3.1-r2
diff --git a/www-apps/nanoblogger/files/nanoblogger-3.1-fix-rss2.diff b/www-apps/nanoblogger/files/nanoblogger-3.1-fix-rss2.diff
new file mode 100644
index 000000000000..9073f8996ad1
--- /dev/null
+++ b/www-apps/nanoblogger/files/nanoblogger-3.1-fix-rss2.diff
@@ -0,0 +1,30 @@
+--- 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-r1.ebuild b/www-apps/nanoblogger/nanoblogger-3.1-r2.ebuild
index e140a83ecff0..dfba4cd7d91f 100644
--- a/www-apps/nanoblogger/nanoblogger-3.1-r1.ebuild
+++ b/www-apps/nanoblogger/nanoblogger-3.1-r2.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.1-r1.ebuild,v 1.2 2005/02/01 17:14:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nanoblogger/nanoblogger-3.1-r2.ebuild,v 1.1 2005/02/18 16:17:39 ka0ttic Exp $
 
-inherit bash-completion
+inherit bash-completion eutils
 
 DESCRIPTION="Small and simple weblog engine written in Bash for the command-line"
 HOMEPAGE="http://nanoblogger.sourceforge.net/"
@@ -22,6 +22,7 @@ src_unpack() {
 		-e 's|^\(BASE_DIR=\).*$|\1"/usr/share/nanoblogger"|' \
 		-e 's|"$BASE_DIR"/\(nb\.conf\)|/etc/\1|' \
 			nb || die "sed nb failed"
+	epatch ${FILESDIR}/${P}-fix-rss2.diff
 }
 
 src_install() {