gentoo resync : 24.07.2021

3 files changed, 1 insertions, 44 deletions

diff --git a/media-gfx/album/Manifest b/media-gfx/album/Manifest
index 380e636eb624..296edbe495e9 100644
--- a/media-gfx/album/Manifest
+++ b/media-gfx/album/Manifest
@@ -1,6 +1,4 @@
-DIST album-4.13.tar.gz 667760 BLAKE2B fa4bd75147d708c18f183787fb62d55a068956204dab249ca2652583421fd444ff6fbbce54e16f02072534050c52c67dabe3c4e6fc977c6aff7317a0df9357d4 SHA512 c22bbc5ad154f35d50d28e5331911d0fd32c5e7f25b659e48274baa1ccc9e3e8b9f771a1bfdf39078c9e959c3fd84b3ccd8528f20f7a80baa7c59bc579579756
 DIST album-4.15.tar.gz 651380 BLAKE2B da6728f65586b242297bb7c8d8ae676de636177539e5c1337e05cdb3f60e39b4135294c5709a92ae670821b1e5cb39f22567e2188c18671681db52f667789c6d SHA512 3e075efd81c829817f42fbe2163269581aa6ac972ec8f14e04237598e08722cdda78cc702e8628a6f77e6c2181ab7bc438f56975f5ed883f5ed9c53ca13edf9a
 DIST data-4.05.tar.gz 6468036 BLAKE2B 3e11911dabcf024934653f5fb5c3c3b65bd2ad5e6607c67ee1dade392540bb0b7c90de521effa5d72d2f40dc6c02016e23d373f714a3b62c15af53ebb4d438d3 SHA512 a7c577df6d10dc2db53fa6d469d2cf9c5115de99df47e79f31ecc0b009bd12e654e4ca7b9e6e78abe90a8a87d5f52ca9946a2d632e3f219d9bcb5ab7838ce42e
-EBUILD album-4.13-r2.ebuild 903 BLAKE2B 22e870b231280d06e24bc6912df99a6d752b55f787d7f15e7574a8a2714057a8ba024f4babc7ffd854e6e8585080964599e3e7907980ca421a7ccef383c108aa SHA512 d98825eb26e99da51b43405a9886595c71aa1a6f2ff9701782a931b75ab914127aa2736a17e61d0206b1f3ab9c06154a54fc2eee6b2556d7f6e6482ad13c9e02
-EBUILD album-4.15-r1.ebuild 944 BLAKE2B 753a055d94e402574b46fcd854ca31035041268e18ed51dd1db6d51c88f33dab97e05cc78e3c968f7ea198e42fba5a0553564cfd59360ec622727fa0f1932ab2 SHA512 7f002d8755a262be08180c07a659b0898f261fbada65fd75ed04fec575d66d57332745cd8d2434b8a215ebab50690644a26086302bb77105e596d03d525ca266
+EBUILD album-4.15-r1.ebuild 910 BLAKE2B 4aeb1572e4643d51d5c24d749959c2776ec90c3137093eb69788e589cb9a2de874cd03ccb9980c473f02ea4de6b0a55ee46cec6c60a221f6c0a9cf030e2ecbf7 SHA512 2966f27f8e7cee628fc888bba5b572fe6ce34844c5d2b073ee3f5d3da3c35a161c420f77ba16798396148945f31ec78d70668edfff9e3c5d02bc4372dacc39aa
 MISC metadata.xml 336 BLAKE2B 837ab4247c02a88070c8bedd8b3a17666672f15d58c0859571c8d5287dd139c87a00c9cb8443961403a70d41456fbc6bbc6f8c4ed519e8ea7a27528337626377 SHA512 57056eb7f228138441d468ebf9ae672dee62f258c33fde97dd6cafea4b9deadb418a011d4222bf75ff8d6953d070a5096a0981c0476c5302566ccd6e643bea0a
diff --git a/media-gfx/album/album-4.13-r2.ebuild b/media-gfx/album/album-4.13-r2.ebuild
deleted file mode 100644
index a590351eb9fa..000000000000
--- a/media-gfx/album/album-4.13-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="HTML photo album generator"
-HOMEPAGE="http://MarginalHacks.com/Hacks/album/"
-SRC_URI="http://marginalhacks.com/bin/album.versions/${P}.tar.gz
-	http://marginalhacks.com/bin/album.versions/data-4.05.tar.gz"
-
-LICENSE="marginalhacks"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="doc ffmpeg plugins themes"
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	media-gfx/jhead
-	virtual/imagemagick-tools
-	ffmpeg? ( media-video/ffmpeg )"
-
-src_install() {
-	dobin album
-	doman album.1
-	dodoc License.txt CHANGELOG
-	use doc && dohtml -r Docs/*
-
-	dodir /usr/share/album
-	insinto /usr/share/album
-	cd ..
-	doins -r lang
-	use themes && doins -r Themes
-	use plugins && doins -r plugins
-}
-
-pkg_postinst() {
-	elog "For some optional tools please browse:"
-	elog "http://MarginalHacks.com/Hacks/album/tools/"
-}
diff --git a/media-gfx/album/album-4.15-r1.ebuild b/media-gfx/album/album-4.15-r1.ebuild
index c62b27853d48..42bc6094f55d 100644
--- a/media-gfx/album/album-4.15-r1.ebuild
+++ b/media-gfx/album/album-4.15-r1.ebuild
@@ -13,7 +13,6 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="doc ffmpeg plugins themes"
 
-DEPEND=""
 RDEPEND="dev-lang/perl
 	media-gfx/jhead
 	virtual/imagemagick-tools
@@ -29,7 +28,6 @@ src_install() {
 		dodoc -r Docs/.
 	fi
 
-	dodir /usr/share/album
 	insinto /usr/share/album
 	cd .. || die
 	doins -r lang