Version bump; update SLOT to 0/25 based on new SONAME

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

4 files changed, 92 insertions, 8 deletions

diff --git a/media-libs/x265/ChangeLog b/media-libs/x265/ChangeLog
index 4993974d0fd9..e3899a6992ae 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.8 2014/06/14 02:40:06 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/ChangeLog,v 1.9 2014/07/27 13:06:12 ssuominen Exp $
+
+*x265-1.2 (27 Jul 2014)
+
+  27 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> +x265-1.2.ebuild,
+  x265-9999.ebuild:
+  Version bump; update SLOT to 0/25 based on new SONAME
 
   14 Jun 2014; Mike Gilbert <floppym@gentoo.org> x265-1.0.ebuild,
   x265-9999.ebuild:
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 9208c92a6dc7..20352b17611f 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -5,15 +5,21 @@ AUX x265-libdir.patch 1321 SHA256 e3ef1a0c7eb72a814963e4fc8b62d3cd5331a4e5f73d50
 AUX x265-libdir_pkgconfig.patch 375 SHA256 82b363812649168d2264ac91d71c6372eb8991e347389d37e81fcfd1d3ae7f60 SHA512 f039b741d78a5cf6ac92f6c4e84a182a117439e6cd61944950437a6d3866a4f51a6e1310745ba17904bb0e786a2aac740fbf80cb780ecad7c881072c5aff350e WHIRLPOOL 93d4e0292b3c5e83294a307975921c5f8f6cf140105460d3640315ff7f7492ad338b179faf47cae8a0f4682fbdd57c414280d4f645d67348c4835442c721de10
 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
 EBUILD x265-0.8.ebuild 1704 SHA256 148a214cdf6c58e552188c5e7541bba67c9f3f89bb19b9fe54cb62ee6307d6b8 SHA512 2171ce414e9f034e722833e4d2c09e56339ee1896bdf5e45a0a2d94c8873a5dc37c49e7e170e8d1cbb3be93926f1ec91e7155a435c6032b12b50ae11abd654f8 WHIRLPOOL e08d6281107a4ce030c80b1cf82e757551f685b012239634cd5bcf30ca9a0bcfe25b428d99e386b18ac2756a2dbe24542b674c9aa06e47415a31b4fd8ab13cad
 EBUILD x265-1.0.ebuild 1663 SHA256 0484facd234c04bd9bc675f4d0a6a3eb4d569725e9cd835c7d57f383ee3fab77 SHA512 5ee645eed42101f69aa537589e0810f1493ef45bd1d479c25fd228703863abaac6c06eed4372f560cf3fd7abc56e429d94614a75b42852d908a3fc06a9549f74 WHIRLPOOL b2558a68a09e4e82ef9867a8b471fab2cbd7400fc0f5e2a38f4fa4524e1ba9bc0eaf4bd85001ece596707b69386b6c2879447b223143de0dee67c018c5e8d222
-EBUILD x265-9999.ebuild 1664 SHA256 e16c08a3f387f840bc818b19bbf6b80e91b6634696ac5a1ffa6aa0b251d1d5f8 SHA512 31c367dbab07c9aa6dfccfeced0e521558a0940c9f4e1d02085f4d5e35ee8847af63869483204269cd2c3b5ed1cc123292080f0e481ade904e565eb7c2cec798 WHIRLPOOL 44a02a6a15702e771d0bef0be91eb87f125008792058903245733523a4a175298276e35dca541eb39c8f6d579c84fdf15348d3372fe8cd8ec2c244b5d94a92b2
-MISC ChangeLog 1631 SHA256 b1d3578c6c2d461ad1b27fbfc037769255c1dcb900ea05821e2f18976c2ca731 SHA512 b63732bbc4256184f8c52c4c36810b353e349fa66a8fe8a9e36c1c1970ed54c09d02a29ae86c91dbf825d266bb474aa5cc7f45290f7e592da3757f35dc4c76c0 WHIRLPOOL 822e211ab1f2e53d0c059a388784933ed3ca794d764d7f2c0f4abb8eec5c59ecac203e5c1eb19a608bd9c65825157f0f35516ba99455718008f6bb737bed1805
+EBUILD x265-1.2.ebuild 1665 SHA256 30e1a3c9959ad547590bfe79b7b92977003aa14a0852fb4254f9603274381e16 SHA512 a7d7fe37de79b83382487701b6666570feb5608661a74244d7ab64eb9227e44f9dc04449bdc2dbe71b9607ac1f21a5766c2f1a07c759d27b6c09ae6b5cf14b31 WHIRLPOOL f83f91e3c0067b8a440486b191f6580cfbe2492662dcab845d8c115712e3dbe332467fad035d1cb4141ac3d15aeaa41464043a7af8078c348ff4ce335f0e653b
+EBUILD x265-9999.ebuild 1666 SHA256 8ed751fb0215ac666dcf0bf11abb4e0c6bf5ed46973c8a51bb4d1734b7a330c0 SHA512 1b048606722f007e78da059f9ccd4934db597d3bbe1448121ea919fcad90355977c54bc01347daf5a0f5b37cfb1fb48574e3c26ee7141b392d303b24664a889d WHIRLPOOL fd9edba13693a600274e89e813b580a2798b3a78bbc179070f260af887dd62cd469951b10a5eea3d1e14db5f4fd9fc57395a8f9e2dc0dcf39aa3624e9ec7dbca
+MISC ChangeLog 1807 SHA256 d0ac14585fd217f195a3b835e9b71c8ca9d7b8dc0c758c6f4f3fa604256fcdda SHA512 2c8a32373971c887c372c9a93e121475b2a6c0caf59df57719f96426e77a3cfb45b05d665b0e11aace1da90d4fc7dfadf5216bba5ae840e560f00577cb5d9be4 WHIRLPOOL 0af533461dce196860cb650c253fb5688bbe501fe8979e5b659a6ee3df9c8e8eefcd6f4dcc0dbb19ca798cff74b1592faaf95c57371c546d7c74649f3c982e92
 MISC metadata.xml 307 SHA256 98aacb70c596475ef9dd8cd433cb49e37e35c424861adcf901867e0f02827fec SHA512 403a65f0b5dbc39253d731cbf44839e073cff48e373f86baf63bdf8e8fc500d0837fa16be0df79950abc19310edba11da22cb6cabdaf9426fa39d136b48ebf3a WHIRLPOOL dad5401206a10b0c1d5823fb41a5c9c8158b8cb43312b123c7d2bdf66c6bf35697ca17238a02cc6288750bad279bc414dea80d7d83f81230957f4a08997fd6c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlObtgcACgkQC77qH+pIQ6SDlgD/REon5+42cqCg2zO9famZUkbH
-srhvfUOmYvUwghNEB7cA/1acM4ouUg20Ow5WS0mPx/Yjlco99VAzCrqCnMrR6RaE
-=LG9s
+iQEcBAEBCAAGBQJT1Pk6AAoJEEdUh39IaPFNbl4H/j7JVQ288uan1JXOB/9FQYdV
+Q/CrHgHIBNCNjtf5U7MxwQWOI+g18VrOsj4n3hkmN6eki32twkZarNJWCGeFBWpI
+iHE4QAFLSkcDNhMQgzlNmcKFbJMi64OSNQ09lPlLuAs/vmMG/FQzz6Uzn9bgz8pU
+WD6/jFoSIOLHeujaU1M4KA+D1g4mD+l/pRhmGIzqGi73MubkAbptAvywWNhg0dFh
+ooc3ymvs5AzzC7BwwpfwUOhBJiS6zjxH2ajI1HYX9oJr7xeLdQNJOrD3cdYI9l4N
+SJSdc3Ubcl8MqafFEizeOup9LNOz6YSvd7XK68H5F1xEv9+SK/NiHAG0+3GxiNo=
+=jvrw
 -----END PGP SIGNATURE-----
diff --git a/media-libs/x265/x265-1.2.ebuild b/media-libs/x265/x265-1.2.ebuild
new file mode 100644
index 000000000000..f98cb1ffb1a4
--- /dev/null
+++ b/media-libs/x265/x265-1.2.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.2.ebuild,v 1.1 2014/07/27 13:06:12 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 ~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/"*
+}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 3f974739cd8a..7e23335e7690 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.7 2014/06/14 02:40:06 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v 1.8 2014/07/27 13:06:12 ssuominen Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/18"
+SLOT="0/25"
 IUSE="+10bit test"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"