summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2011-01-22 15:59:32 +0000
committerFabian Groffen <grobian@gentoo.org>2011-01-22 15:59:32 +0000
commit7607e4b8cfa32286c92ec664091a4f9eb0fb0995 (patch)
tree975f6cad8d128d61bf6590e3f3bf94ac2b0d8ace /x11-libs/libXpm
parentadd lxdm support (changes required in order to load lxdm with --background), ... (diff)
downloadgentoo-2-7607e4b8cfa32286c92ec664091a4f9eb0fb0995.tar.gz
gentoo-2-7607e4b8cfa32286c92ec664091a4f9eb0fb0995.tar.bz2
gentoo-2-7607e4b8cfa32286c92ec664091a4f9eb0fb0995.zip
Move Solaris fix to src_configure, where it *does* work.
(Portage version: 2.2.01.17680-prefix/cvs/SunOS i386)
Diffstat (limited to 'x11-libs/libXpm')
-rw-r--r--x11-libs/libXpm/ChangeLog7
-rw-r--r--x11-libs/libXpm/libXpm-3.5.9.ebuild10
2 files changed, 12 insertions, 5 deletions
diff --git a/x11-libs/libXpm/ChangeLog b/x11-libs/libXpm/ChangeLog
index 19339c4a33ec..a5b6c2b76140 100644
--- a/x11-libs/libXpm/ChangeLog
+++ b/x11-libs/libXpm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/libXpm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.72 2010/12/31 20:07:26 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.73 2011/01/22 15:59:32 grobian Exp $
+
+ 22 Jan 2011; Fabian Groffen <grobian@gentoo.org> libXpm-3.5.9.ebuild:
+ Move Solaris fix to src_configure, where it *does* work.
31 Dec 2010; Jeroen Roovers <jer@gentoo.org> libXpm-3.5.9.ebuild:
Stable for HPPA (bug #344827).
diff --git a/x11-libs/libXpm/libXpm-3.5.9.ebuild b/x11-libs/libXpm/libXpm-3.5.9.ebuild
index 619e38edaf60..aa179f857bfe 100644
--- a/x11-libs/libXpm/libXpm-3.5.9.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.8 2010/12/31 20:07:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.9.ebuild,v 1.9 2011/01/22 15:59:32 grobian Exp $
EAPI=3
inherit xorg-2 flag-o-matic
@@ -18,10 +18,14 @@ RDEPEND="x11-libs/libX11
DEPEND="${RDEPEND}
sys-devel/gettext"
-src_compile() {
+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
}