Version bump.

Package-Manager: portage-2.2.1/cvs/Linux x86_64

3 files changed, 31 insertions, 39 deletions

diff --git a/x11-libs/libSM/ChangeLog b/x11-libs/libSM/ChangeLog
index 1b4b4aba996f..9c2318f1e335 100644
--- a/x11-libs/libSM/ChangeLog
+++ b/x11-libs/libSM/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libSM
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.102 2013/02/26 15:22:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.103 2013/09/11 20:47:13 chithanh Exp $
+
+*libSM-1.2.2 (11 Sep 2013)
+
+  11 Sep 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +libSM-1.2.2.ebuild, -libSM-1.2.0.ebuild:
+  Version bump.
 
 *libSM-1.2.1-r1 (26 Feb 2013)
 
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 483915730d71..93caf1c5b2b9 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,29 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST libSM-1.2.0.tar.bz2 284287 SHA256 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb SHA512 09fd78a060d4527ae2dcd9458bbb23d9b57d9cbf1bad61a5fcfe7d16436d074cbe3bb6d701a6591d828ef7ed172b05cf198e1c051d3319c3ae082c5ae30f811c WHIRLPOOL 7f8910cb7aa62299389270be73f552ead4e66dded6760a1fbe9ee8292c46673b8e43f1ce4ac0cb8b72b38b9d3c6df97f7601b52232399c78e6f05c7db4c217b3
 DIST libSM-1.2.1.tar.bz2 334696 SHA256 93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d SHA512 cf2091224206a273fdfaae9602e241fe2195057254a3504cb502f3eca64dae7f88aad3bfa12b0c8c052094e38cc8727bf3663e62b67f717ed02aada0379252d7 WHIRLPOOL e463600fcc959d61751e026d025be6605e6f6a7a71c6d7beadb4708ce5d341f887130356d43d6a13d449479dfef74bee6dacd812407b21b01e0c36c2d6972a93
-EBUILD libSM-1.2.0.ebuild 1757 SHA256 160ce0a58e67422b6b7ecee22a8df0e8127105235a55ed6fd9aeca11a92607ae SHA512 f160ce79ea72f22bf50308012e4ebbf85ae2c2dfa51c877a1987456a229d647118e1077a6200dddd29a6eba305a302f36b7b3c58acb22d19c38d85dc6ebce732 WHIRLPOOL 16550995c6b5735e2a99d5fcd4c76eb34af9709de74a2d2c1dfeae4f05b48722f6b635ccc97892c1c58256b975d43f5255f7ed34f65582506870dc99b9f9b74d
+DIST libSM-1.2.2.tar.bz2 348908 SHA256 0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd SHA512 dfb91dcc7200fce8d0a62953ae4b81fcb00d525674bbcc6dfcaa23ecb35e1213ceb07cc51f590072dce2107909903160d9f3636a0434fe2a605b1e9a9bd0a6ca WHIRLPOOL d9b45a64ccc85b6ed2eb181bc01e8b9c8b839dfb2b41067665688ee27c7d35cb6f3661f96966bb7c8256b1d9391f613cd11b1ccfc9d3a4c362167fa7b77b135b
 EBUILD libSM-1.2.1-r1.ebuild 1939 SHA256 068ace3ba87bd44b324a5ab2b26f737a0a631896160739dd66664f30eae8aa6c SHA512 88059cf442376c32e6dfe2f80023e155c7a7d76e7b89b88f74d6ea3b0672a2a2371545be701bd5bad102d7edd7b768a0d232fce24260e73e246ed679a9bf9e2e WHIRLPOOL 88648442a5d4cc694d7ff4fb2e432e93ca47fbb9a8805fc28c82f3eed2a6620176675d855f37d7ad6c5859c950d66c43e08785c5ba4d824f2b5f820b57cc37d0
 EBUILD libSM-1.2.1.ebuild 1779 SHA256 3c374b549b7de5890eaf4c3290cf32d03fd3a2ad3f2e483b667a092d9323dd94 SHA512 65a74008e4b4982bf6373383cbcd71f7cade98ecef62e123cfa0350e1f9f01caaf720d3552bb8c728d766a0109b52de237cd1c11bb80ad2b0aa08d3139fd03f8 WHIRLPOOL 700abe952a9e3b976b2db6a87c1b1790404788ca6b2fc61bce9a2cc6cf45e74f79d901f0eed71e1d685a4f0a2c72583a60c7979874a55d8bbfb388da4e3e5965
-MISC ChangeLog 11654 SHA256 007ef65272074d349bf881fb96443f231f3bf3d8c22ec7c01b3a57a99805fbd6 SHA512 16eb7e92a4b8fb7cff7ef25b3a224aaf6118e029d4b2464a8f8a7e53b96851914c2b49fd805fb1acaa02b5994fdff27e654892c689e18503172f8089bd696e1e WHIRLPOOL d016c485d83832baeb2abad9dfca5f412c5f9ad6312b3b27dfa6342d2f21119f2a5ccdb240ead8ee61e558840a3d7f9b7c3ac2647dadc8af7f992b01f0a432ed
+EBUILD libSM-1.2.2.ebuild 1946 SHA256 a76f10da88d7bb532383c9c837497caa0153763bece268b9a15358710eaecf5d SHA512 9f5df60ce6a8798708aae9e652f99216834c8776a2a800bc8ea64d7771396f13f7a84430c7f0e7babbbe11c489898803b78a917ad86e29e4bb337cb5114ad614 WHIRLPOOL f69ef16813eed185d064a779e651d71afdca65c57144b5964d643ca996492ffd1b5617a4d93c36649ef95145c200f35b56f564b47114ecb643e6dfc21f9bd38b
+MISC ChangeLog 11814 SHA256 4eda9362818f8c3f29e17f6b463a38f871ee47b3983f13b93c913e35ace85b79 SHA512 cd3d9ff34e57b9ebc5e9b2458d52fe99c0cf878147945ca9eb2d1f57afd3213193d11232921950a25ef031e23801915fbe0332f376cc5d29eef0620f0e621844 WHIRLPOOL 59c901a80e7611bce7cfb93bdb6106d07f7d0ad90f5706d15e9059fb923bdd58dc29fb77e70d4c7c15a8618d8871575995974fa2a5ff7b1955f4b337f3ec8fb7
 MISC metadata.xml 274 SHA256 8f020073e4576192cb4f631849fd704f25a1ea176368eef75a3c24c4f9727e36 SHA512 1b49ffda0660902d4fb9a6773f3506b7e604194193181b1e04ada84b9e6e2cb772199357aa70230a008a6e94ba6cfe1768573adce10f184e662eaf09f48d2598 WHIRLPOOL 612fb8fd1cb4b1de719a08afd9223e2b053a04005cda7b284c8ea3a1f2c7bc21206666bbd6a13f00fceb2357d7af8d6c0c8b5d73df10cebb346e54503926de50
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQJ8BAEBCABmBQJRLNNRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDqWgQAKGtJxbCEbHPefRbfddfbZTQ
-gn5KLWb8pyzf4c8oFQh8ei11+J8e4IDebIlxMNrixC5GmEtxrd57QFMOw6jQRkU3
-MtXjKHdKLXGViOaZJ7DAyL8bHt8g804o1JMA/zoHWRT7/Ceh0t9fF3Y5SoW//kB0
-7tjTgFaFGMqbKgRhqpUHqRkRHVy7d0ueRR3A3zdB3G6DxBP4DirmjXCQlZL4i16R
-MdWY8pbezwurCPjjI/mmF+S5eS4zjHVQ3m57sqjm0Fg1kSXI+jTTbGABLdCUA139
-kf5oxKqW0Nmmvxd2sB4e0dJIuBFtyr69vPzkpe7KGafP78+dE0epm45W1/Rd9/tk
-9a3iV8B26DOqQkuc7Qlh4NR/59eWu3TuMt7LBVkJ0zyqW+cUzQ0YWfH0b/GXhhqu
-57HnLVyyljDHSvX1vcr/jBGJmSZXbgj9EFPYFmsRHLXY6/N/8l/PXDsINy18Tu/d
-WMARX8q4Rv7eSH31jl8lsAYU4IxDE6oAlSo/3NnSsxbl1bX3ZLuxzB9rDW4x2zmx
-Z6cgmubA3WvMW/T9/0kX1Kghqc10beGYitZxoj95mYVfYVYn+xtvYYonQDLU/wAf
-2WYcnP01DcYFOkutZ51FHABMxs8MIbWxsHQfA6ElW0vvGy46ti4S/lCHttDY5AeB
-RkaAFJRGnYOT4zx2oB5F
-=fO3Q
------END PGP SIGNATURE-----
diff --git a/x11-libs/libSM/libSM-1.2.0.ebuild b/x11-libs/libSM/libSM-1.2.2.ebuild
index 6de845850394..9cd9987f68e8 100644
--- a/x11-libs/libSM/libSM-1.2.0.ebuild
+++ b/x11-libs/libSM/libSM-1.2.2.ebuild
@@ -1,27 +1,32 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild,v 1.14 2011/12/19 09:13:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.2.ebuild,v 1.1 2013/09/11 20:47:13 chithanh Exp $
 
-EAPI=3
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org SM library"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc ipv6 +uuid"
 
-RDEPEND=">=x11-libs/libICE-1.0.5
+RDEPEND=">=x11-libs/libICE-1.0.5[${MULTILIB_USEDEP}]
 	x11-libs/xtrans
-	x11-proto/xproto
+	x11-proto/xproto[${MULTILIB_USEDEP}]
 	!elibc_FreeBSD? ( !elibc_SunOS? (
-		uuid? ( >=sys-apps/util-linux-2.16 )
+		uuid? (
+			>=sys-apps/util-linux-2.16
+			amd64? ( abi_x86_32? (
+				app-emulation/emul-linux-x86-baselibs[development] ) )
+		)
 	) )"
-DEPEND="${RDEPEND}
-	doc? ( app-text/xmlto )"
+DEPEND="${RDEPEND}"
 
-pkg_setup() {
+src_configure() {
 	local withuuid=$(use_with uuid libuuid)
-	xorg-2_pkg_setup
 
 	# do not use uuid even if available in libc (like on FreeBSD)
 	use uuid || export ac_cv_func_uuid_create=no
@@ -46,9 +51,12 @@ pkg_setup() {
 				;;
 		esac
 	fi
-	CONFIGURE_OPTIONS="$(use_enable ipv6)
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
 		$(use_enable doc docs)
 		$(use_with doc xmlto)
 		${withuuid}
-		--without-fop"
+		--without-fop
+	)
+	xorg-2_src_configure
 }