Version bump.

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

3 files changed, 36 insertions, 32 deletions

diff --git a/x11-libs/libXpm/ChangeLog b/x11-libs/libXpm/ChangeLog
index c99310e690ff..ce4787114696 100644
--- a/x11-libs/libXpm/ChangeLog
+++ b/x11-libs/libXpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libXpm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.88 2013/02/26 16:56:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.89 2013/09/11 20:46:20 chithanh Exp $
+
+*libXpm-3.5.11 (11 Sep 2013)
+
+  11 Sep 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +libXpm-3.5.11.ebuild, -libXpm-3.5.9.ebuild:
+  Version bump.
 
 *libXpm-3.5.10-r1 (26 Feb 2013)
 
diff --git a/x11-libs/libXpm/libXpm-3.5.11.ebuild b/x11-libs/libXpm/libXpm-3.5.11.ebuild
new file mode 100644
index 000000000000..5b44f3b6d5f0
--- /dev/null
+++ b/x11-libs/libXpm/libXpm-3.5.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.11.ebuild,v 1.1 2013/09/11 20:46:20 chithanh Exp $
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xpm library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-proto/xextproto[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_configure() {
+	# the gettext configure check and code in sxpm are incorrect; they assume
+	# gettext being in libintl, whereas Solaris has gettext by default
+	# resulting in libintl not being added to LIBS
+	[[ ${CHOST} == *-solaris* ]] && export ac_cv_search_gettext=-lintl
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libXpm/libXpm-3.5.9.ebuild b/x11-libs/libXpm/libXpm-3.5.9.ebuild
deleted file mode 100644
index 6d715b18f1c4..000000000000
--- a/x11-libs/libXpm/libXpm-3.5.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.9.ebuild,v 1.12 2011/06/22 18:37:11 grobian Exp $
-
-EAPI=3
-inherit xorg-2 flag-o-matic
-
-DESCRIPTION="X.Org Xpm library"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-proto/xextproto
-	x11-proto/xproto"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-src_configure() {
-	# the gettext configure check and code in sxpm are incorrect; they assume
-	# gettext being in libintl, whereas Solaris has gettext by default
-	# resulting in libintl not being added to LIBS
-	[[ ${CHOST} == *-solaris* ]] && append-libs -lintl
-	xorg-2_src_configure
-}
-
-src_compile() {
-	xorg-2_src_compile
-}