gentoo resync : 31.12.2018

4 files changed, 2 insertions, 150 deletions

diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index db62bea6d85a..2c8ef2e3025b 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,7 +1,3 @@
-DIST xvidcore-1.3.3.tar.bz2 695279 BLAKE2B 7e24910d51e6e8d9a725aba86a83a59556e85bb953c683eef1d74bd10bf427d22f1d66e86c3a5f6ff73e3b16427af274b51447d1e336968415c252699965bd57 SHA512 e2178ee946fa057cf465da855b702e74fbab04347020ab7900850c07dfcd5202003fcd579fc404e0a567807285607ed4bcd14dc4c074ea19123143f03af80f09
-DIST xvidcore-1.3.4.tar.bz2 697808 BLAKE2B 71ee4e6e73e37055482f4b02859467b2dde0f687b0652b36169b1b77378cf5db77fa805ca932cb4a0772b1abe46f3d4ecb05302c23b951d7e8dfa6888cb53b4f SHA512 09c0dca898ad8ba32161d979dea66730c235d9649e93e5053f0e0f0d02f8996f0f85d629728bff16d3253b71e0435809360e6cf4d72801e63c061f2a0b0dbe7d
 DIST xvidcore-1.3.5.tar.bz2 698846 BLAKE2B c65c90a2a51d993af65becd760364b495ca1714f888c640b577ee3cb509afc5dbe56d1f536aa710a5322106ca65bed4ad162ad97440e9c14deeabbcbe00984b5 SHA512 3297243400ce9ed2d0083559ee15fdfa422e585114c4e92c72fe702f43fea4af9fe4e9e794630959c220222379fa329452c4163a395f4ba1998c9be03a2e9441
-EBUILD xvid-1.3.3.ebuild 1755 BLAKE2B 310eba6d21c2615e55b526bd6d04e0986287e4c8c4300922b3152ce0b445fb04f951d97ae155b9e846925e5722e8d21856d395e8ea0a111f3f753b41a546696c SHA512 94898b6568624ce14930265aa87c79086935f22bea93676fb2c25ce668f5f92ef09badf16d057555f224a6a19e599e2cb2d14af5cf84022515032732385eb854
-EBUILD xvid-1.3.4.ebuild 1771 BLAKE2B 191824e91e62bfbd6dc32f590e37480dd32190a674cf4b8838e00ef94719ce42190427e688e9bd4da58dd211a80b2d21e8bc63b899a24e6dffc264138d627efd SHA512 9a86873ef5f01bd0373882b28ab352f8a03d364a534030a0a12ca76b1a97038844cfcbf09e3297d997cbaf97c5895f53fd9a4f7ba7fcc724d5132be21c352d2d
-EBUILD xvid-1.3.5.ebuild 1703 BLAKE2B 99678ebcad9150f9d6b56b33d9b22bac8b49b02f85cc2da28a927902541586bf07ed0039f21f550064be1b1c0e1ef0e78a77f8938a28683b14295949db4f9cd8 SHA512 4b83b5ee2a25af39c8cb07f0df0484c164a3ddb7b4dc6b3217decbd1edf69b782cf5b6517b45704c71a99570204fe751858754e620c535787f4f24851dea77d6
+EBUILD xvid-1.3.5.ebuild 1702 BLAKE2B 0268da5bfbe707c4e4ddb5fd5db34c4df509f14311ae74af8692059b6e309829b6783253c78cab025fbc91e6d13f98c20df72b549d643e3fc1ab7a21345d6687 SHA512 9a45ad50e4404b112a98d0e1b82175875c257907257a92c3f631ddcc560f8b373e8da4936b84bd15b33dd5c047d6202280e85cd7414e0b249922ab56997f62ba
 MISC metadata.xml 321 BLAKE2B cb6de1ddc565513350b010042d99dd2cb34c0cfa80d26d1324266b6621bea5fe50f4e9233348d0c5d9b9c214d48b9c94e8fc4b08f9c0b43c779b238a65559c03 SHA512 640a21ce70c9b74f86e27bca3153b920ad7ad8313f3f5d6032e41791ab99f7463718f99bfc7fd15613e682769be6fe322c15d3bc841f674bc0322afa130c8b98
diff --git a/media-libs/xvid/xvid-1.3.3.ebuild b/media-libs/xvid/xvid-1.3.3.ebuild
deleted file mode 100644
index c042d207346f..000000000000
--- a/media-libs/xvid/xvid-1.3.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic multilib multilib-minimal
-
-MY_PN=${PN}core
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
-HOMEPAGE="http://www.xvid.org/"
-SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples elibc_FreeBSD +threads pic"
-
-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() {
-	# 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
-	if use pic || [[ ${ABI} == "x32" ]] ; then #421841
-		myconf="--disable-assembly"
-	fi
-
-	econf \
-		$(use_enable threads pthread) \
-		${myconf}
-}
-
-#multilib_src_install() {
-#	emake DESTDIR="${D}" install
-#}
-
-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.4.ebuild b/media-libs/xvid/xvid-1.3.4.ebuild
deleted file mode 100644
index 2611b93fb187..000000000000
--- a/media-libs/xvid/xvid-1.3.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic multilib multilib-minimal
-
-MY_PN=${PN}core
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
-HOMEPAGE="http://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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples elibc_FreeBSD +threads pic"
-
-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() {
-	# 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
-	if use pic || [[ ${ABI} == "x32" ]] ; then #421841
-		myconf="--disable-assembly"
-	fi
-
-	econf \
-		$(use_enable threads pthread) \
-		${myconf}
-}
-
-#multilib_src_install() {
-#	emake DESTDIR="${D}" install
-#}
-
-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
index 328ae0e7b3df..be6e9ef00a34 100644
--- a/media-libs/xvid/xvid-1.3.5.ebuild
+++ b/media-libs/xvid/xvid-1.3.5.ebuild
@@ -13,7 +13,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="elibc_FreeBSD examples pic +threads"
 
 NASM=">=dev-lang/nasm-2"