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
commitd4415437a250bbcc37185a450691d2020b1e8412 (patch)
tree85d97f6e8a8bfb37a98aa2db7241f241b903084d /x11-libs/libXpm
parentadd lxdm support (changes required in order to load lxdm with --background), ... (diff)
downloadhistorical-d4415437a250bbcc37185a450691d2020b1e8412.tar.gz
historical-d4415437a250bbcc37185a450691d2020b1e8412.tar.bz2
historical-d4415437a250bbcc37185a450691d2020b1e8412.zip
Move Solaris fix to src_configure, where it *does* work.
Package-Manager: portage-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/Manifest4
-rw-r--r--x11-libs/libXpm/libXpm-3.5.9.ebuild10
3 files changed, 14 insertions, 7 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/Manifest b/x11-libs/libXpm/Manifest
index 2322c1874ab5..5a2cd76cca73 100644
--- a/x11-libs/libXpm/Manifest
+++ b/x11-libs/libXpm/Manifest
@@ -1,6 +1,6 @@
DIST libXpm-3.5.8.tar.bz2 392021 RMD160 3b2bd291c0037d646042cb502dfffa1ee62c237e SHA1 3bfc833ed4527f74b1c66c386da62271d0313413 SHA256 02a77aaa32e6e335e1ee04aeb9ad1008045d98274d64ed33bc5fc6c3a3542c4c
DIST libXpm-3.5.9.tar.bz2 383818 RMD160 56394f9b168f2765c3f5aedd73799f054b8bae15 SHA1 38258a1d589d3f157e0338d0fd13eec11bc4a39b SHA256 8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e
EBUILD libXpm-3.5.8.ebuild 942 RMD160 f98b426aae8ec45b27714d19e8f27da2643021a0 SHA1 ee73902edf7802467e239746e6e24450e7aefde6 SHA256 b5d03aba0184662ba7ac0505cec3dc1c92c2a87c8fa96034f803031e8916347f
-EBUILD libXpm-3.5.9.ebuild 952 RMD160 e5d619641784d4734cde3c69124d850430ccea5f SHA1 b4c1ba1d73fdab1b6eb3aeadd52c0b135e4ffd94 SHA256 3769befe24e3eea0c3924813905500caca5aa8add531887860774bf1b753f2e8
-MISC ChangeLog 7674 RMD160 7a899261dce2b71ba85f9865875612529427d3d0 SHA1 8c2253154c6d0fdb49b7ecb947e6789089a80ce4 SHA256 1e2b7b75f870b0fff78172f99004e1b8e193f50736f5d5e151f011a19fb7bb44
+EBUILD libXpm-3.5.9.ebuild 999 RMD160 764e7eaae4064b227c725025ae2b083816313225 SHA1 73e05013800d27ff44b61898e468b8d50794fc42 SHA256 3003922976658af08f267392bb9b54c79155d652a0fc1a53d4963fa2c4279463
+MISC ChangeLog 7810 RMD160 86be3c52f3241ded809606df27fa3491621d2031 SHA1 bb1df44c81031ed78773c9dd9a03ddeb39755251 SHA256 470d9a3c7e0eed7ed7a466ef97dced25d34f472fda3b14755682a7ce3fdead22
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
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
}