media-video/bento4: cosmetic changes, clean old

media-video/bento4/Manifest

@@ -1,5 +1 @@
-AUX bento4.pc.in 214 BLAKE2B d98f10901ce3376ff0308b96d81a3b7f244370ac7f7c932f47da5b0b8354b702802407bcbd16735243c4daac15d3962a97a01bfcebb5c5df72226d7ee5a4b08f SHA512 681c62c453d43066fe151c9468fdcddf30e32bcf56708d3347f722e2d0beb79ece52a9e9e573efecbbc89b9a37ccc38c986904282e5c0752c8c0b17ff8859439
-DIST bento4-1.6.0.640.tar.gz 5484136 BLAKE2B 4addca8575e65daf5410a76d59ee200aecfe0d24c55bc19773ddc75723f584eab62681130a1796ccabed6e117ddb7765d75177e2a2b9cd39b7f99d500c35384f SHA512 2c5b9b5cc2aaa6a59eaaf3cf47f91b8748362319c6bf9b954d8fc1fe309fda42e28f03a704783bef215b05578cec1832c6ae07d8f53a2173009e135ae630fae5
 DIST bento4-1.6.0.641.tar.gz 5483983 BLAKE2B 8bec91edcba170917de5941d94fecbc2028d4503651e7863b5c6a5d24bbe442b7a5d53644770d3221c28c5a9f2a2620c04e836f748660a808e27e157db93b117 SHA512 ad92c561a16a830ac63b0fbff98bd14f732dd2e38416de937191b14c750e632c793e5256b92361d3ff8867f9fd1cf727756ba78cd0122af1b79d62532d2ca427
-EBUILD bento4-1.6.0.640.ebuild 1515 BLAKE2B d645cd889a2bcd0d98f595464782a00e13ef87a61ef85bbd0274fc1e28f7ca632fe3beaf7110d8e3b47d8371476c51ca4b272305f7def99e43019a44185096d4 SHA512 4354ce423a10cb27bb24158baed0a301a8d133c3a115757d68760577a85548bc82666888edd3d65f8266a303d2caae0f321d64cb88e29e78e8667f45809584db
-EBUILD bento4-1.6.0.641.ebuild 1515 BLAKE2B d645cd889a2bcd0d98f595464782a00e13ef87a61ef85bbd0274fc1e28f7ca632fe3beaf7110d8e3b47d8371476c51ca4b272305f7def99e43019a44185096d4 SHA512 4354ce423a10cb27bb24158baed0a301a8d133c3a115757d68760577a85548bc82666888edd3d65f8266a303d2caae0f321d64cb88e29e78e8667f45809584db

media-video/bento4/bento4-1.6.0.640.ebuild

@@ -1,64 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Bento4 tools designed to read and write ISO-MP4 files"
-HOMEPAGE="
-	https://www.bento4.com/
-	https://github.com/axiomatic-systems/Bento4
-"
-
-IUSE="+apps"
-
-MY_PV="$(ver_cut 1-3)-$(ver_cut 4)"
-
-SRC_URI="https://github.com/axiomatic-systems/Bento4/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-S="${WORKDIR}/${PN^}-${MY_PV}"
-
-src_prepare() {
-	sed -i 's#ap4 STATIC#ap4 SHARED#g' CMakeLists.txt
-	sed -e 's#@BENTO4_VERSION@#'${MY_PV}'#g' "${FILESDIR}"/bento4.pc.in > bento4.pc
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_BUILD_RPATH=ON
-		-DBUILD_APPS=$(usex apps ON OFF)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cd "${BUILD_DIR}" || die
-
-	# Avoid conflicts with media-libs/libmp4v2[utils]
-	mv mp4extract mp4extract-bento4 || die
-	mv mp4info mp4info-bento4 || die
-
-	if use apps; then
-		dobin aac2mp4 avcinfo fixaacsampledescription hevcinfo mp42aac mp42avc \
-			mp42hevc mp42hls mp42ts mp4audioclip mp4compact mp4dcfpackager \
-			mp4decrypt mp4diff mp4dump mp4edit mp4encrypt mp4extract-bento4 \
-			mp4fragment mp4iframeindex mp4info-bento4 mp4mux mp4pssh mp4rtphintinfo \
-			mp4split mp4tag
-	fi
-
-	dolib.so libap4.so
-
-	insinto "${EPREFIX}"/usr/include/bento4
-	doins ${S}/Source/C++/*/*.h
-
-	insinto "${EPREFIX}"/usr/$(get_libdir)/pkgconfig
-	doins ${S}/bento4.pc
-
-	dodoc ${S}/Documents/LICENSE.txt
-}

media-video/bento4/bento4-1.6.0.641.ebuild

@@ -3,6 +3,8 @@
 
 EAPI=8
 
+MY_PV="$(ver_cut 1-3)-$(ver_cut 4)"
+
 inherit cmake
 
 DESCRIPTION="Bento4 tools designed to read and write ISO-MP4 files"
@@ -11,21 +13,22 @@ HOMEPAGE="
 	https://github.com/axiomatic-systems/Bento4
 "
 
-IUSE="+apps"
+SRC_URI="
-
+	https://github.com/axiomatic-systems/Bento4/archive/refs/tags/v${MY_PV}.tar.gz
-MY_PV="$(ver_cut 1-3)-$(ver_cut 4)"
+		-> ${P}.tar.gz
-
+"
-SRC_URI="https://github.com/axiomatic-systems/Bento4/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN^}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
-S="${WORKDIR}/${PN^}-${MY_PV}"
+IUSE="+apps"
 
 src_prepare() {
-	sed -i 's#ap4 STATIC#ap4 SHARED#g' CMakeLists.txt
+	sed -i 's#ap4 STATIC#ap4 SHARED#g' CMakeLists.txt || die
-	sed -e 's#@BENTO4_VERSION@#'${MY_PV}'#g' "${FILESDIR}"/bento4.pc.in > bento4.pc
+	sed -e 's#@BENTO4_VERSION@#'${MY_PV}'#g' "${FILESDIR}"/bento4.pc.in > bento4.pc || die
+
 	cmake_src_prepare
 }
 
@@ -54,11 +57,11 @@ src_install() {
 
 	dolib.so libap4.so
 
-	insinto "${EPREFIX}"/usr/include/bento4
+	insinto /usr/include/bento4
-	doins ${S}/Source/C++/*/*.h
+	doins "${S}"/Source/C++/*/*.h
 
-	insinto "${EPREFIX}"/usr/$(get_libdir)/pkgconfig
+	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${S}/bento4.pc
+	doins "${S}"/bento4.pc
 
-	dodoc ${S}/Documents/LICENSE.txt
+	dodoc "${S}"/Documents/LICENSE.txt
 }

media-video/bento4/metadata.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>david.guglielmi@gmail.com</email>
+	<name>David GUGLIELMI</name>
+	</maintainer>
+	<use>
+		<flag name="apps">Bento4 cli utils</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">axiomatic-systems/Bento4</remote-id>
+	</upstream>
+</pkgmetadata>