gentoo resync : 08.01.2021

4 files changed, 2 insertions, 142 deletions

diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index b89bd91105c9..dd0fd952579e 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,6 +1,3 @@
-DIST xvidcore-1.3.5.tar.bz2 698846 BLAKE2B c65c90a2a51d993af65becd760364b495ca1714f888c640b577ee3cb509afc5dbe56d1f536aa710a5322106ca65bed4ad162ad97440e9c14deeabbcbe00984b5 SHA512 3297243400ce9ed2d0083559ee15fdfa422e585114c4e92c72fe702f43fea4af9fe4e9e794630959c220222379fa329452c4163a395f4ba1998c9be03a2e9441
 DIST xvidcore-1.3.7.tar.bz2 698615 BLAKE2B 19bea63226c2223e74e5202d3b671c5b292c03ce5de240df7d8ce34101de4036b28fad516b2a56712a099819b905e68922fa83a01fbe4f200dc880ca56c10a96 SHA512 e2b22e7a7e103af7adcc999d95484f991a0a33df02b912fe042b2e23d2af07381c737d23158dbf0fad770ee680572f86fbe04ab2ef33c81e2e0180ead2acc8ed
-EBUILD xvid-1.3.5-r1.ebuild 1749 BLAKE2B 524b85ade8e5b1102227cc13912f6162e78a43e4ba91d17dfb4240e5bb2db8762dd9ecb9605ed02121936038ad716f497b2a85b4fa78d6f894d881f413143c97 SHA512 3be60bb77595d630dc186942bd9786653871b175473c4fba5809f6804db45bc5394e2ea4827d3cfd25ff5cb77a2369b168df623a0c28e3b3e7e6e25927a7f3ee
-EBUILD xvid-1.3.5.ebuild 1671 BLAKE2B 1e0a92fabe7f932e3b8056132ed976183020a51c4f31a82e4dd365f5798e517cbebaa777c2bbc5e3f7bd9db5f6a7d0e7fcf02d97da818674130acf2203950586 SHA512 11c910115ea186c7175b1e4fc9a45d08a3524973fb30359a3c8135a834ce6c705f1d7f478316b68ee52579e90c8f6fcca750a6010759a3fb90a17a96ae310d80
-EBUILD xvid-1.3.7.ebuild 1749 BLAKE2B dafc72de747f4d0db3b6a8bceccfc67af04e4ab7db77d9e7a65805bc2d16b7c040e0ad0d8812ebb36730da8a519f15feb656daaf38be85c72e04c78fd5b2f60f SHA512 b647dd4403a4477f7735ae7615aed35e81f5eaa6cd88bd06ab8294a0c1cfc7473409929ad0bbf5dcf5e8b30a7cc43d93ec6c8f549c528a77e69ff391fe51a9eb
+EBUILD xvid-1.3.7.ebuild 1708 BLAKE2B 6b95f8745a9e11cf92b8277a9f5044642ce15628bb36cdb75ae4409d33e63182bdfb3fab566a07ffb44a9d5b734a930bb10aa1bdbabec81faa88fbcd33bb1619 SHA512 589de775c65d3e8448f77baff8dddb922580a2f7cf88419bd8590987b1670da5b4fbe899c228fdf8ac27220e100da3fa77742d461ebfe252387cc2866f668f89
 MISC metadata.xml 321 BLAKE2B cb6de1ddc565513350b010042d99dd2cb34c0cfa80d26d1324266b6621bea5fe50f4e9233348d0c5d9b9c214d48b9c94e8fc4b08f9c0b43c779b238a65559c03 SHA512 640a21ce70c9b74f86e27bca3153b920ad7ad8313f3f5d6032e41791ab99f7463718f99bfc7fd15613e682769be6fe322c15d3bc841f674bc0322afa130c8b98
diff --git a/media-libs/xvid/xvid-1.3.5-r1.ebuild b/media-libs/xvid/xvid-1.3.5-r1.ebuild
deleted file mode 100644
index 4f98d5f3a9d1..000000000000
--- a/media-libs/xvid/xvid-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN}core"
-MY_P="${MY_PN}-${PV}"
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="High performance/quality MPEG-4 video de-/encoding solution"
-HOMEPAGE="https://www.xvid.org/"
-SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="elibc_FreeBSD examples pic +threads"
-
-NASM=">=dev-lang/nasm-2"
-YASM=">=dev-lang/yasm-1"
-
-BDEPEND="sys-apps/grep"
-DEPEND="amd64? ( || ( ${YASM} ${NASM} ) )
-	x86? ( || ( ${YASM} ${NASM} ) )
-	x86-macos? ( ${NASM} )
-	x64-macos? ( ${NASM} )"
-
-S="${WORKDIR}/${MY_PN}/build/generic"
-
-src_prepare() {
-	default
-
-	# make build verbose
-	sed \
-		-e 's/@$(CC)/$(CC)/' \
-		-e 's/@$(AS)/$(AS)/' \
-		-e 's/@$(RM)/$(RM)/' \
-		-e 's/@$(INSTALL)/$(INSTALL)/' \
-		-e 's/@cd/cd/' \
-		-e '/\$(libdir)\/\$(STATIC_LIB)/d' \
-		-e 's/\$(BUILD_DIR)\/\$(STATIC_LIB)//g' \
-		-e 's/info \$(STATIC_LIB)/info/g' \
-		-i Makefile || die
-	# Since only the build system is in $S, this will only copy it but not the
-	# entire sources.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	use sparc && append-cflags -mno-vis #357149
-	use elibc_FreeBSD && export ac_cv_prog_ac_yasm=no #477736
-
-	local myconf=( $(use_enable threads pthread) )
-	if use pic || [[ ${ABI} == "x32" ]] ; then #421841
-		myconf+=( --disable-assembly )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc "${S}"/../../{AUTHORS,ChangeLog*,CodingStyle,README,TODO}
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r "${S}"/../../examples
-	fi
-}
diff --git a/media-libs/xvid/xvid-1.3.5.ebuild b/media-libs/xvid/xvid-1.3.5.ebuild
deleted file mode 100644
index 1b896fd798fe..000000000000
--- a/media-libs/xvid/xvid-1.3.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN}core"
-MY_P="${MY_PN}-${PV}"
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="High performance/quality MPEG-4 video de-/encoding solution"
-HOMEPAGE="https://www.xvid.org/"
-SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="elibc_FreeBSD examples pic +threads"
-
-NASM=">=dev-lang/nasm-2"
-YASM=">=dev-lang/yasm-1"
-
-DEPEND="sys-apps/grep
-	amd64? ( || ( ${YASM} ${NASM} ) )
-	amd64-fbsd? ( ${NASM} )
-	x86? ( || ( ${YASM} ${NASM} ) )
-	x86-fbsd? ( ${NASM} )
-	x86-macos? ( ${NASM} )
-	x64-macos? ( ${NASM} )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}/build/generic"
-
-src_prepare() {
-	default
-
-	# make build verbose
-	sed \
-		-e 's/@$(CC)/$(CC)/' \
-		-e 's/@$(AS)/$(AS)/' \
-		-e 's/@$(RM)/$(RM)/' \
-		-e 's/@$(INSTALL)/$(INSTALL)/' \
-		-e 's/@cd/cd/' \
-		-i Makefile || die
-	# Since only the build system is in $S, this will only copy it but not the
-	# entire sources.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	use sparc && append-cflags -mno-vis #357149
-	use elibc_FreeBSD && export ac_cv_prog_ac_yasm=no #477736
-
-	local myconf=( $(use_enable threads pthread) )
-	if use pic || [[ ${ABI} == "x32" ]] ; then #421841
-		myconf+=( --disable-assembly )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc "${S}"/../../{AUTHORS,ChangeLog*,CodingStyle,README,TODO}
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r "${S}"/../../examples
-	fi
-}
diff --git a/media-libs/xvid/xvid-1.3.7.ebuild b/media-libs/xvid/xvid-1.3.7.ebuild
index 9149c76fa1b6..ee6cc488d233 100644
--- a/media-libs/xvid/xvid-1.3.7.ebuild
+++ b/media-libs/xvid/xvid-1.3.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xvid.com/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="elibc_FreeBSD examples pic +threads"
 
 NASM=">=dev-lang/nasm-2"
@@ -22,7 +22,6 @@ YASM=">=dev-lang/yasm-1"
 BDEPEND="sys-apps/grep"
 DEPEND="amd64? ( || ( ${YASM} ${NASM} ) )
 	x86? ( || ( ${YASM} ${NASM} ) )
-	x86-macos? ( ${NASM} )
 	x64-macos? ( ${NASM} )"
 
 S="${WORKDIR}/${MY_PN}/build/generic"