Version bump.

(Portage version: 2.2.1/cvs/Linux x86_64, unsigned Manifest commit)

2 files changed, 28 insertions, 14 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/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
 }