gentoo resync : 22.01.2021

5 files changed, 80 insertions, 65 deletions

diff --git a/app-misc/note/Manifest b/app-misc/note/Manifest
index be8ab37d9b93..3bb05312f5ab 100644
--- a/app-misc/note/Manifest
+++ b/app-misc/note/Manifest
@@ -1,4 +1,5 @@
+DIST note-1.3.26.tar.gz 53485 BLAKE2B b88fe67b708d85a60ea705caa99506a5ef59c442ed233b349cb07bf1cbc80514e8324b63f6e7a1ea6727e9742b11ecf4c460ecda818fc03de4532a132e3aa608 SHA512 4de22da10aef93e694cd1facb356666241435d2a468c25d43f42453c708d9a75b451820a01d952e587cca34b310a64c6e0069cdbe264376eb0cf50e3f852a252
 DIST note-1.3.3.tar.gz 42691 BLAKE2B f4dc9b5c006925c04706260ed0d11f1c5bfb0923786284401c1f824936a32b61a60e516b35070cb4dcd8302caec820aad37e02c31c5fd50a8931d4cba54ef5ad SHA512 99744394084eec3bf84ecef10b2bc294375f18f6ce41614316c4f4bc02a73297f4b3a956f48fb424bb0b0f100ea23debea49c1029887ca52043dd733de0fcfad
-EBUILD note-1.3.3-r1.ebuild 1231 BLAKE2B ba0eef1712c8668bf5fb31b3f6c65b760030bac6f15201111c93ec9b6915735cee9ca434ac4c94d258a397f419379f45ae1feceee80d9bc7ec094560eb17694c SHA512 3510b02d469fc064209e3534db4353c51cd5057ab329d1cde7fa363e1b1a89ddf18b1ec3e7ee15b6b98eb563a93c48a053558a043a5313696261081f16174c2f
-EBUILD note-1.3.3-r2.ebuild 1324 BLAKE2B 7a604b50b71997aceae7e83b7ecf9ccb5f6408caa7f65b21156d759ea58d5c300f6bbbe6a8dffe16e2e6deabcf799b6e0f4bcdf783e0b09aa8518b664570731c SHA512 02de76e10586c371652f6189893a59eba3a500d479470fa95707fbd9175e0c7259f4e21c03e780a3de1ae20f0c46a4e43be10e2cce5bfbee47193db1520aa84b
-MISC metadata.xml 304 BLAKE2B 31f4157a7266980036c3450e1a3fa977448d5d5080189bb76c0dc974e6de75ce80b4f675f2f7a2bfa216c918337539f800d7f029e9ca9f930ac797caf8caf6d6 SHA512 0f0f283bc7066279d7d9dc7e9148173b1f7c5efdae22cf9013e6b04d15f68889016fb1c856d0a7906961023aaa7c302f93b8c5d2a0f65a4a333d318f699c70bc
+EBUILD note-1.3.26.ebuild 1345 BLAKE2B 6f1b5a6c8423d634df39e7fdd5454e6e36504c54730fbfe53afd9358a3eb080a0ac3cdc89af557a4e2db903cd1f2f713f7990f3d02bec916db602c0ac5f502f5 SHA512 0384afe90f034f06984548e61a4642647d9918ef978e4b9020a5163df61d3b18b9d29217748981ffaf6ddde0f170169b22704d9a1bf431baba699ce8f89ed3d0
+EBUILD note-1.3.3-r2.ebuild 1321 BLAKE2B 048c1db99c1562b4e1e2ab89ef50c4bd338a9a87b7eb00a1c1e9e1ff08ccf9a81abf33622dfa2a753841d492fcfa24d4c7fad6c38477e42e2b570fa589f1db38 SHA512 9213fd08ea701cad178fc0a222accc4bfcb9ccb62034fcd58e87d0b90b02a9fa8ae445807d368f9e8c519393bfdd251a032847b69ab7e424b9f8f28b81439c86
+MISC metadata.xml 404 BLAKE2B d3156915a5f7af0c7bb45f39e7083fefe0eccc23fa2e278b236447144dbc132443fee61adda923687bd507892fa1d027e2494ce63f0ea219ba2274b036d2d533 SHA512 e2e8d63b287148f69f14e2fef3ee6c89ada388d69ea7a589a5ca8e75726d93fbcd419bfc26ee09549a429aa0ecb63a6e521ccfe25550f6169df3f6b92a7f078d
diff --git a/app-misc/note/metadata.xml b/app-misc/note/metadata.xml
index 83abb215223d..e5943dae0588 100644
--- a/app-misc/note/metadata.xml
+++ b/app-misc/note/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-  <flag name="general">Add support for ascii flatfile backend</flag>
-  <flag name="text">Add support for text backend</flag>
-</use>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="general">Add support for ascii flatfile backend</flag>
+		<flag name="text">Add support for text backend</flag>
+	</use>
+	<upstream>
+		<changelog>https://www.daemon.de/idisk/txt/note.Changelog</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/note/note-1.3.26.ebuild b/app-misc/note/note-1.3.26.ebuild
new file mode 100644
index 000000000000..94a63b164318
--- /dev/null
+++ b/app-misc/note/note-1.3.26.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-module
+
+DESCRIPTION="A note taking perl program"
+HOMEPAGE="https://www.daemon.de/NOTE"
+SRC_URI="https://www.daemon.de/idisk/Apps/note/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="crypt dbm general mysql text"
+
+DEPEND="
+	dev-perl/Config-General
+	dev-perl/TermReadKey
+	dev-perl/Term-ReadLine-Perl
+	dev-perl/YAML
+	virtual/perl-Storable
+	crypt? (
+		dev-perl/Crypt-CBC
+		dev-perl/Crypt-Blowfish
+		dev-perl/Crypt-DES
+	)
+	mysql? ( dev-perl/DBD-mysql )
+"
+RDEPEND="${DEPEND}"
+
+# extraneous README that gets installed into the perl module
+PERL_RM_FILES=( NOTEDB/README )
+
+src_prepare() {
+	# Supressing file not needed
+	local v
+	for v in mysql text dbm general; do
+		if ! use ${v}; then
+			PERL_RM_FILES+=( NOTEDB/${v}.pm )
+		fi
+	done
+	perl-module_src_prepare
+}
+
+src_install() {
+	perl-module_src_install
+
+	# Adding some basic utitily for testing note
+	exeinto /usr/share/${PN}
+	doexe bin/stresstest.sh
+
+	# Adding some help for mysql backend driver
+	if use mysql; then
+		insinto /usr/share/${PN}/mysql
+		exeinto /usr/share/${PN}/mysql
+		doins mysql/{README,sql,permissions}
+		doexe mysql/install.sh
+	fi
+
+	# Adding a sample configuration file
+	insinto /etc
+	doins config/noterc
+
+	dodoc UPGRADE VERSION
+}
diff --git a/app-misc/note/note-1.3.3-r1.ebuild b/app-misc/note/note-1.3.3-r1.ebuild
deleted file mode 100644
index 35fba906d5da..000000000000
--- a/app-misc/note/note-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="A note taking perl program"
-HOMEPAGE="http://www.daemon.de/NOTE"
-SRC_URI="http://www.daemon.de/files/mirror/ftp.daemon.de/scip/Apps/note/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="crypt dbm general mysql text"
-
-DEPEND="dev-perl/TermReadKey
-	dev-perl/Term-ReadLine-Perl
-	virtual/perl-Storable
-	dev-perl/Config-General
-	crypt? ( dev-perl/Crypt-CBC
-		dev-perl/Crypt-Blowfish
-		dev-perl/Crypt-DES )
-	mysql? ( virtual/mysql
-		dev-perl/DBD-mysql )"
-RDEPEND=""
-
-src_install() {
-	perl-module_src_install
-
-	# Adding some basic utitily for testing note
-	dodir /usr/share/${PN}
-	cp "${S}/bin/stresstest.sh" "${D}/usr/share/${PN}"
-
-	# Adding some help for mysql backend driver
-	if use mysql; then
-		dodir /usr/share/${PN}/mysql
-		cp -r "${S}/mysql" "${D}/usr/share/${PN}"
-	fi
-
-	# Adding a sample configuration file
-	dodir /etc
-	cp "${S}/config/noterc" "${D}/etc"
-
-	# Supressing file not needed
-	for v in mysql text dbm general; do
-		if ! use ${v}; then
-			for u in `find "${D}" -type f -name *${v}.*pm`; do
-				rm "${u}"
-			done
-		fi
-	done
-
-	dodoc UPGRADE VERSION
-}
diff --git a/app-misc/note/note-1.3.3-r2.ebuild b/app-misc/note/note-1.3.3-r2.ebuild
index fc0e6b7a020b..59c93175ac43 100644
--- a/app-misc/note/note-1.3.3-r2.ebuild
+++ b/app-misc/note/note-1.3.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.daemon.de/idisk/Apps/note/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="crypt dbm general mysql text"
 
 DEPEND="dev-perl/TermReadKey