old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

6 files changed, 6 insertions, 268 deletions

diff --git a/media-libs/x265/ChangeLog b/media-libs/x265/ChangeLog
index 1ece2fa9c9ed..d90b2f51dfab 100644
--- a/media-libs/x265/ChangeLog
+++ b/media-libs/x265/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/x265
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/ChangeLog,v 1.12 2014/09/12 07:05:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/ChangeLog,v 1.13 2014/09/12 07:06:36 ssuominen Exp $
+
+  12 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> -files/x265-libdir.patch,
+  -files/x265-libdir_pkgconfig.patch, -x265-0.8.ebuild, -x265-1.0.ebuild,
+  -x265-1.2.ebuild:
+  old
 
 *x265-1.3 (12 Sep 2014)
 
diff --git a/media-libs/x265/files/x265-libdir.patch b/media-libs/x265/files/x265-libdir.patch
deleted file mode 100644
index 728fad1e9dc5..000000000000
--- a/media-libs/x265/files/x265-libdir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: x265-9999/source/CMakeLists.txt
-===================================================================
---- x265-9999.orig/source/CMakeLists.txt
-+++ x265-9999/source/CMakeLists.txt
-@@ -246,8 +246,8 @@ if(NOT MSVC)
- endif()
- install(TARGETS x265-static
-         RUNTIME DESTINATION bin
--        LIBRARY DESTINATION lib
--        ARCHIVE DESTINATION lib)
-+        LIBRARY DESTINATION lib${LIB_SUFFIX}
-+	ARCHIVE DESTINATION lib${LIB_SUFFIX})
- install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
- 
- if(CMAKE_RC_COMPILER)
-@@ -284,8 +284,8 @@ if(ENABLE_SHARED)
-         set_target_properties(x265-shared PROPERTIES VERSION ${X265_LATEST_TAG} SOVERSION ${X265_BUILD})
-         install(TARGETS x265-shared
-                 RUNTIME DESTINATION bin
--                LIBRARY DESTINATION lib
--                ARCHIVE DESTINATION lib)
-+                LIBRARY DESTINATION lib${LIB_SUFFIX}
-+		ARCHIVE DESTINATION lib${LIB_SUFFIX})
-     endif()
- endif()
- 
-@@ -305,7 +305,7 @@ if(X265_LATEST_TAG)
-     # Produce a pkg-config file
-     configure_file("x265.pc.in" "x265.pc" @ONLY)
-     install(FILES       "${CMAKE_CURRENT_BINARY_DIR}/x265.pc"
--            DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
-+	    DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
- endif()
- 
- if(NOT WIN32)
diff --git a/media-libs/x265/files/x265-libdir_pkgconfig.patch b/media-libs/x265/files/x265-libdir_pkgconfig.patch
deleted file mode 100644
index 4159fbadaa9f..000000000000
--- a/media-libs/x265/files/x265-libdir_pkgconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: x265-9999/source/x265.pc.in
-===================================================================
---- x265-9999.orig/source/x265.pc.in
-+++ x265-9999/source/x265.pc.in
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
- includedir=${prefix}/include
- 
- Name: @CMAKE_PROJECT_NAME@
diff --git a/media-libs/x265/x265-0.8.ebuild b/media-libs/x265/x265-0.8.ebuild
deleted file mode 100644
index c4ffd713ccde..000000000000
--- a/media-libs/x265/x265-0.8.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-0.8.ebuild,v 1.4 2014/07/27 19:01:15 maekke Exp $
-
-EAPI=5
-
-inherit cmake-multilib flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
-	inherit mercurial
-	EHG_REPO_URI="http://bitbucket.org/multicoreware/x265"
-else
-	SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/7"
-IUSE="+10bit test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-libdir.patch"
-	"${FILESDIR}/${PN}-libdir_pkgconfig.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		mercurial_src_unpack
-		# Can't set it at global scope due to mercurial.eclass limitations...
-		export S=${WORKDIR}/${P}/source
-	else
-		unpack ${A}
-		export S=$(echo "${WORKDIR}"/*${PN}*/source)
-	fi
-}
-
-multilib_src_configure() {
-	append-cflags -fPIC
-	append-cxxflags -fPIC
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTS)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
-	)
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	multilib_parallel_foreach_abi multilib_src_configure
-}
-
-multilib_src_test() {
-	cd "${BUILD_DIR}/test" || die
-	for i in PoolTest TestBench ; do
-		./${i} || die
-	done
-}
-
-src_test() {
-	multilib_foreach_abi multilib_src_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-	dodoc -r "${S}/../doc/"*
-}
diff --git a/media-libs/x265/x265-1.0.ebuild b/media-libs/x265/x265-1.0.ebuild
deleted file mode 100644
index 04669177c015..000000000000
--- a/media-libs/x265/x265-1.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-1.0.ebuild,v 1.3 2014/07/27 19:01:15 maekke Exp $
-
-EAPI=5
-
-inherit cmake-multilib multilib flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
-	inherit mercurial
-	EHG_REPO_URI="http://bitbucket.org/multicoreware/x265"
-else
-	SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/16"
-IUSE="+10bit test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		mercurial_src_unpack
-		# Can't set it at global scope due to mercurial.eclass limitations...
-		export S=${WORKDIR}/${P}/source
-	else
-		unpack ${A}
-		export S=$(echo "${WORKDIR}"/*${PN}*/source)
-	fi
-}
-
-multilib_src_configure() {
-	append-cflags -fPIC
-	append-cxxflags -fPIC
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTS)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	multilib_parallel_foreach_abi multilib_src_configure
-}
-
-multilib_src_test() {
-	cd "${BUILD_DIR}/test" || die
-	for i in PoolTest TestBench ; do
-		./${i} || die
-	done
-}
-
-src_test() {
-	multilib_foreach_abi multilib_src_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-	dodoc -r "${S}/../doc/"*
-}
diff --git a/media-libs/x265/x265-1.2.ebuild b/media-libs/x265/x265-1.2.ebuild
deleted file mode 100644
index 9dd29cf3ec86..000000000000
--- a/media-libs/x265/x265-1.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-1.2.ebuild,v 1.2 2014/07/27 19:01:15 maekke Exp $
-
-EAPI=5
-
-inherit cmake-multilib multilib flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
-	inherit mercurial
-	EHG_REPO_URI="http://bitbucket.org/multicoreware/x265"
-else
-	SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/25"
-IUSE="+10bit test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		mercurial_src_unpack
-		# Can't set it at global scope due to mercurial.eclass limitations...
-		export S=${WORKDIR}/${P}/source
-	else
-		unpack ${A}
-		export S=$(echo "${WORKDIR}"/*${PN}*/source)
-	fi
-}
-
-multilib_src_configure() {
-	append-cflags -fPIC
-	append-cxxflags -fPIC
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTS)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	multilib_parallel_foreach_abi multilib_src_configure
-}
-
-multilib_src_test() {
-	cd "${BUILD_DIR}/test" || die
-	for i in PoolTest TestBench ; do
-		./${i} || die
-	done
-}
-
-src_test() {
-	multilib_foreach_abi multilib_src_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-	dodoc -r "${S}/../doc/"*
-}