Version bump wrt #522618 (raise subslot based on SONAME)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 92 insertions, 12 deletions

diff --git a/media-libs/x265/ChangeLog b/media-libs/x265/ChangeLog
index 19dc45bac00f..1ece2fa9c9ed 100644
--- a/media-libs/x265/ChangeLog
+++ b/media-libs/x265/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2014/07/28 08:03:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/ChangeLog,v 1.12 2014/09/12 07:05:00 ssuominen Exp $
+
+*x265-1.3 (12 Sep 2014)
+
+  12 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> +x265-1.3.ebuild,
+  x265-9999.ebuild:
+  Version bump wrt #522618 (raise subslot based on SONAME)
 
   28 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> x265-9999.ebuild:
   Add ~arm to KEYWORDS also in -9999.ebuild because it's the base for next
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 86340b18cdbd..fd04fcb829f3 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -6,20 +6,22 @@ AUX x265-libdir_pkgconfig.patch 375 SHA256 82b363812649168d2264ac91d71c6372eb899
 DIST x265-0.8.tar.bz2 542439 SHA256 279985c47034dda4b3b9fef114aba3c8e8a3d1b26d59cc54ec7d52d13e086835 SHA512 78f7cd0aa6482d6ae921bf7cabc580cd9784a75920eb211a9cbe17fce2168fefe466e6ce1b21b8e7f4fd3ab51d80f33388bf6ec68e0203714294591d0c08b43c WHIRLPOOL 82136477653809fd39a9ad9e2db54bfe972e4eebf451295fd086e6c311d3ed6ef3db4b85c83d5620207035c43ad113ab0e6482357d448685e05950452b804564
 DIST x265-1.0.tar.bz2 564321 SHA256 38b5a8e30eb4e7f7968ca33366a6539b8a7cfdd5aec36ad502ad6eb5c9c35aa8 SHA512 885389a4b039d7c75e28698109c3e2b4b7a83aec5b177940d91ad05a2061bf02233ac4efa01d42a7835df5d7fae6496d80c7baed51f02a40b9bd987a20c95539 WHIRLPOOL a8d1bc1c6b7ba51022a4c7d3507ff640e752d03a1a33b00ce7097d23e8ea4d92aec9005d638280045032929eb9e0129525d27bb8ec29301dda73272546e74694
 DIST x265-1.2.tar.bz2 573907 SHA256 5f5ae7b9cf73b6ecaa1d169fd9f68f3efad75b0d23f504eeca92d57b3f0cb829 SHA512 60591f5c7bff651b8bae23e14d15ccf2752e1c6edc4547508a8349888d99c9d3f513fe9515acfaaaa8073f6e2f022f6bdc35e5d34516bc75f9fddf3d74018daa WHIRLPOOL a7da95ef7740f96aa66c4490e28b53750c4c666187db6a52666eca3748fa5023da1ad4224f39a1c1d49dfd5259635ce99645351244a7113e6d429aa716c6a12f
+DIST x265-1.3.tar.bz2 562401 SHA256 3807090a99bc351894d58eb037db4f1487b2dba3489eb2c38ab43dd6b7c9b09d SHA512 6743ba5796e032e3b814a2702b88d08c8228da5b0d7cc97f5e38052427f56ba101d63f6076c2438377b72de8d57bb26c350a908920e78faadfe84a14fdafa655 WHIRLPOOL 03114c0f719dfaecc7c970f89ee4eb5cfb46f1f94619bd80f0721ddb32b48f34f1e75ee727168035126edd6355101786b89ae718a786803f26dcca2f102793d8
 EBUILD x265-0.8.ebuild 1707 SHA256 3c84d37769b58658508a1708e3dfd9075f6bd7963be65c61cc5b8222ec80933c SHA512 782f44afbd04f5fd9f703d3dc26e69d6c150573890dd46a0d7c7321043dfec414ff3804878cc1c6fb53a054e009c69c4f4ac1ebb6e240aaacdc42f4d72f21ab8 WHIRLPOOL cce68fac15889e82f6115a691ffcb6b731807eeaa7b20fc41a79cd3a8fd3efc926fb2467c6ab1d3532b7bf970468cfe2e9225e972567919da6a36670db06cb79
 EBUILD x265-1.0.ebuild 1667 SHA256 e5cf34cf8bcc16a03b4628436c12ad0efd6e47c07985ebe9fa93cea7f02a4735 SHA512 92485fe7ae9c67b2be22bc83498b27800001265db684bef34b3b06a14411bcdbd365a6359ae4b7ee4b2edfe162501c6599f6ff9c636d9c6d4804152465db6c65 WHIRLPOOL bbe9a06f6b7d02c0c8cbb855c6f723f68e917214ad673f145a06e709fdc1d73e27a4450b7c384009f068d187515d48bd93770f29fbd9b7f4cf2b99bc600c7d5e
 EBUILD x265-1.2.ebuild 1667 SHA256 619777d425122dc9e6cf6c1b35f8fe22b533edc0dc045c9423ee41b9d39bb143 SHA512 c9656306c6e3867bdcb7bda41eb06acae2fe38c37f9ff314567d318d3b936c3cdb639b12655cb9ec569313dabf0a9a519ae746905fb8b0a29d5528a8b86698f3 WHIRLPOOL f095435d27e2d4e38bcbbd6a73a3fb61689d8255ceb34dc5253867d5ec6801ea6ad8c8144b4a766522331edcbf55675790cc23fab761c837aa03f2ac5cc6a116
-EBUILD x265-9999.ebuild 1671 SHA256 da08e10d1a492b1aa2a562765c4c20533c79210f44d4ce40ad7b194475bafa01 SHA512 7a08906b84f7a60979cc6f6d1eeea5766f8ea883c723bebdfeb0c70aec9cb92928f91c4b1e1ab8941fd0df0cb9b9126184761d6111e08bfb509bd54ce8f77f13 WHIRLPOOL 36ef6f547ca1e20f0e5c5e9edd6859eafc4e5bdeb8e201e5dfcc7c828674d1fb0646a2f825b237aa458b91df26c892e345fbb64af0b0fe9fb5e8c037bd10491e
-MISC ChangeLog 2098 SHA256 fe8eb8a897b53c454518d37c56aec84564be22d76f505b512862e2e21197f647 SHA512 bc4603202023d6cb0fd9fac34168c126083d3242c12641ebe61c998bd64f164f2d4b6b0ca0409187bd63bba52bebcaaf8949511ed03577a4058967c212807c46 WHIRLPOOL 13a48381ee345ca1d5ccdf36446d938be844712863e71d3583eaa95f2a7dfbbd8801eb06bff361aa2d037835e58caeee11c36ec380ef91c4ad49f207d0105cbd
+EBUILD x265-1.3.ebuild 1670 SHA256 67047b0eab2c05957d9d930f50dbde6f23c54d46d199c25964a1c4d5706cc9f8 SHA512 dc89a01891528cd3a2d8aeaee78560b715f3f4229005819ace2e86cf972d315c83899d28a0e7e71d32b5455ab43958e354f406c5ce26046b5f4c33eb00abec61 WHIRLPOOL 8f57b9c6e050d118f3d15a9df2856a67816b089791adf0c702914b0d14456d710bc181228e0fbef92418883825366b554d72c2bbf979cbb6386a53c7ceb72eb3
+EBUILD x265-9999.ebuild 1672 SHA256 84c06163a1f34bb19b4fbcef971febb3631a9178a8e267a138179ec8d01268cf SHA512 52b9d451064a36cbd88f4f6b780787fdd3807e2c729da785beb4339339e38f87e1628bfbe5e6828bb1a24427d97cca77a6b904fbc73d5edc9dafa09a96c76a2b WHIRLPOOL 48a0f0f14261a17ac9b9aa5deeabd908f73453989331652f7642f6086036e69d997ecc0ee87f12e887f7ab05e79c9ac5892d1edfc34d2fba2c9d9b99077ce9cb
+MISC ChangeLog 2275 SHA256 1962b017601decbf475481a5093f276c8b835c3c70c6e69cec8b0eefdcbe8886 SHA512 5a7a70d895d360902429970fa074cb0cb298c92bf671186cbc281dca65f63f9ba5ec37685f824dd10fee25399469f8afb49f004e51126a0c8bcc29f60948ab58 WHIRLPOOL 5137c9ca866e6a07f8ee80059ac656e6a228ab06dad4e00b5ff8f12244d8aec0873e12dd9a1d764c4387f8d1ca8d98d382fe0a617680f7294618468e5cfd7b6d
 MISC metadata.xml 307 SHA256 98aacb70c596475ef9dd8cd433cb49e37e35c424861adcf901867e0f02827fec SHA512 403a65f0b5dbc39253d731cbf44839e073cff48e373f86baf63bdf8e8fc500d0837fa16be0df79950abc19310edba11da22cb6cabdaf9426fa39d136b48ebf3a WHIRLPOOL dad5401206a10b0c1d5823fb41a5c9c8158b8cb43312b123c7d2bdf66c6bf35697ca17238a02cc6288750bad279bc414dea80d7d83f81230957f4a08997fd6c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT1gOrAAoJEEdUh39IaPFNeVsH/RfP6of1uIQ+2s4D5kesZLiL
-QViwD6rx5VyvACg/rAlpImF0QzqOTkG/WB+0015E8JreKQtyadPkxZtMyxAG/K3Y
-VDzWK8Db5jypSeUG4Ow60UNt7BBtWjSHC4+kC/3gZxPqpnvj3CCzmZVHblMvwLc1
-lBPg7dIML6GDyOiBUOc2/e4p4IMm0BJ1+p1scpTFeITrdQyVJ/mJRVUzxUU0cPrd
-rJea7d9PXIRJgvsHjrAwQo2tJrJsxkfaCNlZSd/OZThLtP5nVXjEMvfMCykduH8k
-K+9uUCr/+szNKssBceJJ7LjMP3Bd8d3MuYboqvtLlSWIPQReYaekYb6O68zuZsA=
-=Gukg
+iQEcBAEBCAAGBQJUEppCAAoJEEdUh39IaPFN3qYIAJfI67Ftx++Itq7QWMszZD32
+vwBnbI1ooa6NyPvHcykImF/L1u/fx191wrzc2B8GsbaecJmaSuj7S/VO+JVlSWxv
+6fMWUznwWk7KoebPNPbff9v1E2e66APPRxHsD2HyPIUFY/2P48NHPDcnd1Viu85P
+07IY+W+luPvs+6wi6+U4sroZn7YuipIJ5fd9Ld+CK2QMyR8vk03nZ6tNyMUwe8/l
+8P6rGS8JA1qapbG5mw5HNnRb8/ALfHYkU56g/4F4qZNPqvY7wmgxx6g2JoxvSmMn
+pSkLPtsojqVNB+W8/FY8LPD7krEXuztZWiLdUrk94DglnibAk64ivrYqUEX0wi0=
+=D7Ow
 -----END PGP SIGNATURE-----
diff --git a/media-libs/x265/x265-1.3.ebuild b/media-libs/x265/x265-1.3.ebuild
new file mode 100644
index 000000000000..20ae72269caf
--- /dev/null
+++ b/media-libs/x265/x265-1.3.ebuild
@@ -0,0 +1,72 @@
+# 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.3.ebuild,v 1.1 2014/09/12 07:05:00 ssuominen 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/31"
+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-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 81cdac13705e..1fcc11f1bfff 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.9 2014/07/28 08:03:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v 1.10 2014/09/12 07:05:00 ssuominen Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/25"
+SLOT="0/31"
 IUSE="+10bit test"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"