gentoo resync : 13.10.2019

3 files changed, 3 insertions, 68 deletions

diff --git a/www-apps/nanoblogger/Manifest b/www-apps/nanoblogger/Manifest
index 873da858f2a9..e1843c5d3555 100644
--- a/www-apps/nanoblogger/Manifest
+++ b/www-apps/nanoblogger/Manifest
@@ -1,6 +1,4 @@
 AUX nb.bashcomp 1275 BLAKE2B 0e6fefe950988c1f290f442781eb284f4c762365387cc58e67502558291e0ef77557adb7af57346ee5a1a0438c0307fa2c6956fb63a621f7bdb4b1c7684800c7 SHA512 004db772c4f97870ebdbe378adc26f70ce42f8f28b68bed53fcbe2df4d95ce38e4a2608fee94ae17b1f057c28859a321cceb6cdd4f849845b5902ad048541c8e
-DIST nanoblogger-3.2.3.tar.gz 54672 BLAKE2B ab53f85d93d30e0db96d62b0dc5c0f079df1710ebe1b35be0c772d44eb01182617bbdfbbcb9e563861b9122363ee660f685683c54995ad539b8cd9803c29b6a1 SHA512 5cd771d1621a6e5fdb60cf34f294e93596584d7535d4a89a98fd8332c85b58e70715a9bf34e46839a1756a8827f37f998f105ba1e494cabefb780e81f6deb8d7
 DIST nanoblogger-3.5-rc1.tar.gz 131833 BLAKE2B d5918e406d0b5c6d82b466b43ed84b413fc539651baa568eacbd70b47eae4b382a4f621c8195631b47ef2039d6a4e0b569596a6d601881b195b1db5f7098d90c SHA512 03a590b1bdf3adb9969e2ce6fda89ece99f33def9f46e1028d2c0724a86f47696c703a5a3bb3c4b1c34418b841702a15bae527cc94eba377ee2003203582de2f
-EBUILD nanoblogger-3.2.3.ebuild 1984 BLAKE2B 2f3e061b242e8fe93aa68e0d2dbb593a08f53033a00bf87010cc7ef6d51cc81c46ddfc2883cb6d8e4869231a17ec2db6304f72fd0d761bffe23c8ea50052a1a9 SHA512 0ee6e34be5b0b9c30779d95ccbcf37ef98be8da311de9693c5f01e164412fa7edb4bb8f497cdef7633058a533ef5737d60c9dd908671180280d9650f2b2b0a56
-EBUILD nanoblogger-3.5_rc1-r1.ebuild 2222 BLAKE2B 7bdb8bf78f60cf0fc707ac947af8fbea0b47cea31a14f931baab2cb2f98349d2d20e4fa6a73352efd7bbbe3d477aa73b928373fd1e582d427aa6c44ff5c3c468 SHA512 4d4f953b77fa166b51ab55a16a3d01d0df8594aaa60ab86101d219090f8dc00eebd58e6e90d8e7ad93e1d8dafc5b3cc0d23f6e2990619f35918a7ddab80d3581
+EBUILD nanoblogger-3.5_rc1-r1.ebuild 2215 BLAKE2B 2913958b71b2786211694ed553b169570c7d545ad31448b8f59b0dc5b240ff74f66c85f508156c4bca6ef5578108dbcf91c0c8572e841eebf0b391b36efff480 SHA512 457d55bd27dc2dec0f123dd8b7b1aa8a4bdce063656757e6a134f41f2295a64267b016c489692c39aa5219831e05faf043f9487b125475f9e6593456040ecc57
 MISC metadata.xml 1158 BLAKE2B 0b261c973a5196c38ce880dd3f3ce99e368b86ca909190bf4934a50d94ebf1ccce9e01f99cd7812702dc1fcde47a5d9c91fdd5411599e46454f38cfb3831c9d6 SHA512 51fefdaaa979d1625c710655dcd2cf6bb2f1f0143f533b2b2ce1ee8022b6bfac20c9cc92dbd125aac5b19878df28e735f70653f75331c86f7152c194d37994f5
diff --git a/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild b/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild
deleted file mode 100644
index a4e50036ec2c..000000000000
--- a/www-apps/nanoblogger/nanoblogger-3.2.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit bash-completion-r1
-
-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 ~hppa ia64 ~mips ppc x86"
-IUSE=""
-
-RDEPEND="app-shells/bash"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e 's|^\(NB_BASE_DIR=\).*$|\1"/usr/share/nanoblogger"|' \
-		-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"
-}
-
-src_install() {
-	dobin nb
-	insinto /usr/share/nanoblogger
-	doins -r default moods plugins
-	insinto /etc
-	doins nb.conf
-	dodoc ChangeLog
-	dohtml docs/nanoblogger.html
-	dobashcomp "${FILESDIR}"/nb.bashcomp || die
-}
-
-pkg_postinst() {
-	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
-	elog "To create and configure a new weblog, run the following as your user:"
-	elog "   nb -b /some/dir -a"
-	elog "where /some/dir is a directory that DOES NOT exist."
-	elog
-	elog "To prevent having to specify your blog directory every time you use"
-	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
-}
diff --git a/www-apps/nanoblogger/nanoblogger-3.5_rc1-r1.ebuild b/www-apps/nanoblogger/nanoblogger-3.5_rc1-r1.ebuild
index f090ae374974..7317da5b6b3b 100644
--- a/www-apps/nanoblogger/nanoblogger-3.5_rc1-r1.ebuild
+++ b/www-apps/nanoblogger/nanoblogger-3.5_rc1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc x86"
 
 RDEPEND="app-shells/bash"