summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2011-11-11 17:23:49 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2011-11-11 17:23:49 +0000
commit3f0ec64e856f0d92a52f52dd81d5c97a0b603198 (patch)
tree9a9c2ef04659f30aa174b35d84ef64a39e115837 /sys-apps/lshw
parentRemove stuff properly... (diff)
downloadhistorical-3f0ec64e856f0d92a52f52dd81d5c97a0b603198.tar.gz
historical-3f0ec64e856f0d92a52f52dd81d5c97a0b603198.tar.bz2
historical-3f0ec64e856f0d92a52f52dd81d5c97a0b603198.zip
Fix bug #389801, allowing a clean build with [gtk,-sqlite].
Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/lshw')
-rw-r--r--sys-apps/lshw/ChangeLog5
-rw-r--r--sys-apps/lshw/Manifest16
-rw-r--r--sys-apps/lshw/lshw-02.15b.ebuild4
3 files changed, 12 insertions, 13 deletions
diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index 88beeeecf3f5..a57e6bd0116d 100644
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/lshw
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.97 2011/10/08 05:02:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.98 2011/11/11 17:23:49 flameeyes Exp $
+
+ 11 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> lshw-02.15b.ebuild:
+ Fix bug #389801, allowing a clean build with [gtk,-sqlite].
08 Oct 2011; Tim Harder <radhermit@gentoo.org>
-files/lshw-02.12.01b-build.patch, -lshw-02.14b.ebuild,
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 32e84d57ef0a..51dd88c7b769 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,19 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
AUX lshw-02.15b-build.patch 3735 RMD160 1512c4bc7549c8847bc7beed3564caeaa3f9f9bf SHA1 8006e54aaf79235a2f7fcaba15d1f594dfaa6175 SHA256 1183485aa48e16a99b1a0d4aaa7c48a2d1f0056579334c78090eae2f35cd6a87
DIST lshw-B.02.15.tar.gz 1384466 RMD160 565ea7849fc6ad4ba1368da560a0d1d2000d5b3e SHA1 488b5b014ac06c1d4448f0517f874bcb568c57c0 SHA256 fb01cec64bc9067cce61cd64f8ad81f2f0082985fad5b627cf4bd71ba43735a6
-EBUILD lshw-02.15b.ebuild 1397 RMD160 eb25ec6123a4b4fa7e49a97e47e1e4f5274b9e34 SHA1 224a1e66092c9d35db5b00dbca0c3337770036ef SHA256 26dd1db18a30bf0517eb585e5943d368daa7c977a9146477ac65cae6178ddfa8
-MISC ChangeLog 11606 RMD160 fd08811b336fb7ab3cea93f1a9605600c424fb04 SHA1 96eab8a9ff692a6a9c277b0bd49d2fd4c5cdfce4 SHA256 8d4092db8f737053e9bd7b1577d8dd96c03544f60cf6a8459cd977f75a2111e2
+EBUILD lshw-02.15b.ebuild 1414 RMD160 de01381b03e4744e86c64dcfdd16649d24761adc SHA1 96c676842e402b4e7e8db5e1f62bee547f2106ff SHA256 e7e164fdc6b0d13ee8541c1d4491defa6230b73d3f8f7898683c3166778f0572
+MISC ChangeLog 11745 RMD160 40e73cf3f14a631e2a0893b6b5e9f22ed361392d SHA1 a9489db609097daede8b7852e928f1b1386bb3f6 SHA256 c43695aafd0ab34c6f9f53ddfd12c4b4611920700c19016afd263e46a2aa7194
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBCgAGBQJOj9mLAAoJEEqz6FtPBkyjUIsIAK2/i5jACPzJIi4oJ6w3Eek+
-O++CmsuT/ovKE6KpKkpyrTtgKayqLCA21wg2uUtq3gLfRPFzpJy/45e3sGBKYkeG
-uTR5sUmVLnbVysHS/+Xw8KCW4RLQb8Em9v0l5j1vvsomvZfkSXphMKawfIKeghlU
-jy3zBKD5AnU8w7i6QRa9zF7GltfiZ0RIwcj83eTuN9ZvMNKBjNloNA20u7QjzoJe
-TBoETndsnV3WEUyiHuzwad0GRDk7VygyQGD7WkAWd24pqjmaaNKBHF7+qeo9z3e7
-nNUB0i3JYxWxKtXKOmpWz0OHiXKWzrhBEyB1aD2LUn3G69/MCaldWbEHFFNIN3M=
-=qbYC
+iEYEARECAAYFAk69WhUACgkQAiZjviIA2XgU+wCg5I2kiO1xu9DP/AVWS+a7uJIC
+o8cAoMEnMsU1v8zxwozk+8KOI27VdByG
+=Uy1m
-----END PGP SIGNATURE-----
diff --git a/sys-apps/lshw/lshw-02.15b.ebuild b/sys-apps/lshw/lshw-02.15b.ebuild
index 77bd25b2c5c5..4086449069d1 100644
--- a/sys-apps/lshw/lshw-02.15b.ebuild
+++ b/sys-apps/lshw/lshw-02.15b.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.15b.ebuild,v 1.13 2011/07/29 08:01:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.15b.ebuild,v 1.14 2011/11/11 17:23:49 flameeyes Exp $
EAPI=3
inherit flag-o-matic eutils toolchain-funcs
@@ -40,7 +40,7 @@ src_compile() {
emake SQLITE=$sqlite || die "emake failed"
if use gtk ; then
- emake gui || die "emake gui failed"
+ emake SQLITE=$sqlite gui || die "emake gui failed"
fi
}