summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-07-22 04:06:54 +0000
committerMike Frysinger <vapier@gentoo.org>2005-07-22 04:06:54 +0000
commit9f39f8bede1ac60a9fe491939d77e63eb21ff994 (patch)
tree2038ea16201e62f0a1b5117e246f91e7670353c4 /sys-apps/lshw
parentoops, forgot to commit removal ... use portage-utils now (diff)
downloadhistorical-9f39f8bede1ac60a9fe491939d77e63eb21ff994.tar.gz
historical-9f39f8bede1ac60a9fe491939d77e63eb21ff994.tar.bz2
historical-9f39f8bede1ac60a9fe491939d77e63eb21ff994.zip
add support for USE=static #78975 by Thomas Eckert
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'sys-apps/lshw')
-rw-r--r--sys-apps/lshw/Manifest18
-rw-r--r--sys-apps/lshw/lshw-02.04b.ebuild11
2 files changed, 22 insertions, 7 deletions
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 85e735696658..dfffa1b122a9 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,12 +1,22 @@
-MD5 519c3737147966c1501d9c4a36cb057e ChangeLog 2852
-MD5 adb173eeefdb402a41199c13d1acc2ae lshw-02.04b.ebuild 1223
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
MD5 77da13ea7a4884c23e600060e7a436e1 lshw-02.00b.ebuild 1195
MD5 c3f7305f7029ae0433f991a43c09c55a lshw-02.03b.ebuild 1183
MD5 fd4b9f1adceb4e7e601a71c3bdd9d3e4 lshw-02.02b.ebuild 1192
+MD5 519c3737147966c1501d9c4a36cb057e ChangeLog 2852
+MD5 8acb70976be17c39d5349c85e31a76f8 lshw-02.04b.ebuild 1384
+MD5 29a53d370bf1395481ea9d8528f410d1 files/digest-lshw-02.04b 64
+MD5 82aaf8441fb4eff63a536f97a4bfd9b5 files/digest-lshw-02.03b 64
MD5 e1b0c289650e6fc413a9001627b004a0 files/02.00b-dev.patch 966
MD5 078518c848aac3fcee935427f1849647 files/digest-lshw-02.00b 64
-MD5 82aaf8441fb4eff63a536f97a4bfd9b5 files/digest-lshw-02.03b 64
MD5 555b9015ffbcc8fd484c63ab096069d7 files/02.00b-cpuid-PIC.patch 1098
MD5 7842b41ab472dcf4e60cb6e43c2079f1 files/digest-lshw-02.02b 64
-MD5 29a53d370bf1395481ea9d8528f410d1 files/digest-lshw-02.04b 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC4HDygIKl8Uu19MoRAo/zAJ9MDg6g8lLFDWGw6Mx+T7bXgZ1QgACdGUL3
+ly9FRdgKFwGGDc22OQcBVUQ=
+=wCHe
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/lshw/lshw-02.04b.ebuild b/sys-apps/lshw/lshw-02.04b.ebuild
index e5351acfbb5f..4840a5da4286 100644
--- a/sys-apps/lshw/lshw-02.04b.ebuild
+++ b/sys-apps/lshw/lshw-02.04b.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.04b.ebuild,v 1.4 2005/06/10 00:51:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.04b.ebuild,v 1.5 2005/07/22 04:06:54 vapier Exp $
inherit flag-o-matic eutils toolchain-funcs
@@ -16,7 +16,7 @@ SRC_URI="http://ezix.sourceforge.net/software/files/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc sparc x86"
-IUSE="gtk"
+IUSE="gtk static"
DEPEND="gtk? ( >=x11-libs/gtk+-2 )
>=sys-devel/binutils-2.15"
@@ -27,11 +27,16 @@ src_unpack() {
unpack ${A}
cd "${S}"
+ use static && append-ldflags -static
sed -i \
-e "/^CXXFLAGS/s:-Os:${CXXFLAGS}:" \
+ -e '/^LDFLAGS=/s:-Os -s::' \
-e '/^CXX=/d' -e '/^CC=/d' \
src/{gui/,core/,}/Makefile \
|| die "sed failed"
+ sed -i \
+ -e "/^LDFLAGS=/s:$: ${LDFLAGS}:" \
+ src/Makefile || die "sed ldflags failed"
#epatch ${FILESDIR}/${PV}-dev.patch #75168
epatch "${FILESDIR}"/02.00b-cpuid-PIC.patch #61947
@@ -52,5 +57,5 @@ src_install() {
make DESTDIR="${D}" install-gui || die "install gui failed"
fi
- dodoc README TODO docs/*
+ dodoc README docs/*
}