Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2006-09-29 22:40:15 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2006-09-29 22:40:15 +0000
commit2b32fe3f5218b8b254e8b45a9ea04e5ccdbe9ef2 (patch)
treeb60c787bdd14122a4ae7356494044491974e60fb /sys-apps
parentremoved old versions (diff)
downloadhistorical-2b32fe3f5218b8b254e8b45a9ea04e5ccdbe9ef2.tar.gz
historical-2b32fe3f5218b8b254e8b45a9ea04e5ccdbe9ef2.tar.bz2
historical-2b32fe3f5218b8b254e8b45a9ea04e5ccdbe9ef2.zip
Fix bugs #142542 and #149531.
Package-Manager: portage-2.1.2_pre1-r4
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/hwinfo/ChangeLog6
-rw-r--r--sys-apps/hwinfo/Manifest20
-rw-r--r--sys-apps/hwinfo/files/hwinfo-13.0-makefile-fixes.patch13
-rw-r--r--sys-apps/hwinfo/hwinfo-13.0.ebuild6
4 files changed, 33 insertions, 12 deletions
diff --git a/sys-apps/hwinfo/ChangeLog b/sys-apps/hwinfo/ChangeLog
index 349b9ffd9eea..0e5a1389b60c 100644
--- a/sys-apps/hwinfo/ChangeLog
+++ b/sys-apps/hwinfo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/hwinfo
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/ChangeLog,v 1.4 2006/09/29 02:16:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/ChangeLog,v 1.5 2006/09/29 22:40:15 robbat2 Exp $
+
+ 29 Sep 2006; Robin H. Johnson <robbat2@gentoo.org>
+ +files/hwinfo-13.0-makefile-fixes.patch, hwinfo-13.0.ebuild:
+ Fix bugs #142542 and #149531.
29 Sep 2006; Robin H. Johnson <robbat2@gentoo.org> hwinfo-13.0.ebuild:
Update deps for latest version, bug #143088.
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index 78cb73c1ab6b..cc31628102fc 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,3 +1,7 @@
+AUX hwinfo-13.0-makefile-fixes.patch 465 RMD160 9ee69b43fb1cd158b1858cca4be1061689c83a28 SHA1 3090b80d5a03f8fd4667187bb7c1bf65812cd6fa SHA256 1fd1324f81e9f4e7418223bee75f36d3e328ed70bd6c3d394f519da4127de7b5
+MD5 71dd8536aac6df1b8a1cf3b1661ef42f files/hwinfo-13.0-makefile-fixes.patch 465
+RMD160 9ee69b43fb1cd158b1858cca4be1061689c83a28 files/hwinfo-13.0-makefile-fixes.patch 465
+SHA256 1fd1324f81e9f4e7418223bee75f36d3e328ed70bd6c3d394f519da4127de7b5 files/hwinfo-13.0-makefile-fixes.patch 465
AUX hwinfo-8.38-makefile-fixes.patch 2119 RMD160 1e5ee878154f78cfea59a7481542cad53eb1541c SHA1 d45797c8dc5b42b184679ea0ab903e35ac6fe264 SHA256 7db701f829dee500d286cc70c312342aac3d5d96e5192f028ccbaf02558d629a
MD5 9bf18c38512621782e2f300bdf133d38 files/hwinfo-8.38-makefile-fixes.patch 2119
RMD160 1e5ee878154f78cfea59a7481542cad53eb1541c files/hwinfo-8.38-makefile-fixes.patch 2119
@@ -5,18 +9,18 @@ SHA256 7db701f829dee500d286cc70c312342aac3d5d96e5192f028ccbaf02558d629a files/hw
DIST hwinfo-8.38.tar.gz 569050 RMD160 3ccb827a4addb2688f7b1c7faf661ef8a6667c2f SHA1 339863afbd3472a6db266976398aa1b1157402cd SHA256 5b77373beb11ad558ba786a279580143214e1b5bd3e873b191c72bc266224ea2
DIST hwinfo_13.0-4.diff.gz 10308 RMD160 bf323419c70c4e474d14e6b38fe4ebd042141827 SHA1 a68351f4504870c5daa6500ee8ff19696f9df52b SHA256 26b6da993ffafe471bdb86c9d2dacb3865b102e7fcad48f7cf288aa232a171dd
DIST hwinfo_13.0.orig.tar.gz 792900 RMD160 26dba3dea1553da097208b93d54d65b981820ef0 SHA1 3c7bee9eec23a6e53eb1a67b229bfcc605fb1fc5 SHA256 35f3affcd122cecf98435fbeff8971149faa80e5b3c4c31664ba6167f2566ad9
-EBUILD hwinfo-13.0.ebuild 1597 RMD160 dc5c92c4e3bcf2e4e8c161c7fa30b938dd8ce68b SHA1 cd5385977a62a186a4ea6cc136847c32e4a8047a SHA256 a65f986e2279e7a89a304593ca2cd9a6121c315d4f323073794208090304774c
-MD5 e93042537ebc8755cdc5f23899f15989 hwinfo-13.0.ebuild 1597
-RMD160 dc5c92c4e3bcf2e4e8c161c7fa30b938dd8ce68b hwinfo-13.0.ebuild 1597
-SHA256 a65f986e2279e7a89a304593ca2cd9a6121c315d4f323073794208090304774c hwinfo-13.0.ebuild 1597
+EBUILD hwinfo-13.0.ebuild 1600 RMD160 e0169913f8be960f1bde0882fb0bd7b75e52c525 SHA1 a5b5f3164d688abf35ccee44ede56c4d6f3bc41a SHA256 1ed60ad57d5f652fd1e59dfee680dd081d7ad58ba46aded5f90c904ec70d442a
+MD5 f7d5ac2456f186b4d326cb1c3ad29069 hwinfo-13.0.ebuild 1600
+RMD160 e0169913f8be960f1bde0882fb0bd7b75e52c525 hwinfo-13.0.ebuild 1600
+SHA256 1ed60ad57d5f652fd1e59dfee680dd081d7ad58ba46aded5f90c904ec70d442a hwinfo-13.0.ebuild 1600
EBUILD hwinfo-8.38.ebuild 1068 RMD160 0fc76f8e03dd98d767acc93a56f7e3b439c3ebb4 SHA1 bae99b7b341acb34196ff4b37ed77342648d7628 SHA256 7e83114e43d7e99a210fd33446016b11ea72a4b3d04360f00d5e109b2f094fc0
MD5 e614d3fa834eb77b781bf692a14442b6 hwinfo-8.38.ebuild 1068
RMD160 0fc76f8e03dd98d767acc93a56f7e3b439c3ebb4 hwinfo-8.38.ebuild 1068
SHA256 7e83114e43d7e99a210fd33446016b11ea72a4b3d04360f00d5e109b2f094fc0 hwinfo-8.38.ebuild 1068
-MISC ChangeLog 921 RMD160 5688833f8c639bba37d08cedc405eeccb91563b3 SHA1 33e478a5bbce8b92b08f54550db796070c97a22b SHA256 944b8fbbd840b559582b228376385d26fa49cdd6f82b8d2a0122bc31d2cf89b9
-MD5 f51678cb3ea4b200144bd3edaf0e9e28 ChangeLog 921
-RMD160 5688833f8c639bba37d08cedc405eeccb91563b3 ChangeLog 921
-SHA256 944b8fbbd840b559582b228376385d26fa49cdd6f82b8d2a0122bc31d2cf89b9 ChangeLog 921
+MISC ChangeLog 1070 RMD160 0d597f5a8a2fa8167ccbbc16d6f5d628b8ef7659 SHA1 f34a199b41550be90f694fd50baab96ee1e40db6 SHA256 0aab4f4fc16926a7e8128c0419abb8664659dfa64ea039b3699002788262a81a
+MD5 091ec9659df0cb6df5025035a022eff9 ChangeLog 1070
+RMD160 0d597f5a8a2fa8167ccbbc16d6f5d628b8ef7659 ChangeLog 1070
+SHA256 0aab4f4fc16926a7e8128c0419abb8664659dfa64ea039b3699002788262a81a ChangeLog 1070
MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
RMD160 ffa99612cf27469c417944deed0e0c9155e64331 metadata.xml 223
diff --git a/sys-apps/hwinfo/files/hwinfo-13.0-makefile-fixes.patch b/sys-apps/hwinfo/files/hwinfo-13.0-makefile-fixes.patch
new file mode 100644
index 000000000000..2378a05bb78b
--- /dev/null
+++ b/sys-apps/hwinfo/files/hwinfo-13.0-makefile-fixes.patch
@@ -0,0 +1,13 @@
+diff -urN hwinfo-13.0.orig/Makefile.common hwinfo-13.0/Makefile.common
+--- hwinfo-13.0.orig/Makefile.common 2005-09-20 10:32:52.000000000 +0100
++++ hwinfo-13.0/Makefile.common 2006-07-22 15:00:38.000000000 +0100
+@@ -20,7 +20,7 @@
+
+ CC = gcc
+ LD = ld
+-CFLAGS = -Wall -Wno-pointer-sign -O2 -pipe -g $(SHARED_FLAGS) $(EXTRA_FLAGS) -I$(TOPDIR)/src/hd
++CFLAGS = -Wall -pipe -g $(SHARED_FLAGS) $(EXTRA_FLAGS) -I$(TOPDIR)/src/hd
+ SHARED_FLAGS = -fPIC
+
+ LDFLAGS = -Lsrc
+
diff --git a/sys-apps/hwinfo/hwinfo-13.0.ebuild b/sys-apps/hwinfo/hwinfo-13.0.ebuild
index 32fca128387d..510f4ef1237f 100644
--- a/sys-apps/hwinfo/hwinfo-13.0.ebuild
+++ b/sys-apps/hwinfo/hwinfo-13.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/hwinfo-13.0.ebuild,v 1.2 2006/09/29 02:16:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwinfo/hwinfo-13.0.ebuild,v 1.3 2006/09/29 22:40:15 robbat2 Exp $
inherit eutils
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~ppc ~x86 ~amd64"
IUSE=""
-RDEPEND="sys-fs/sysfsutils
+RDEPEND=">=sys-fs/sysfsutils-2
sys-apps/hal
sys-apps/dbus"
# this package won't work on *BSD
@@ -29,7 +29,7 @@ src_unpack (){
for p in ${S}/debian/patches/*; do
EPATCH_OPTS="-p1 -d ${S}" epatch ${p}
done
- #EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-makefile-fixes.patch
+ EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-makefile-fixes.patch
#sed -i -e "s,^LIBS[ \t]*= -lhd,LIBS = -lhd -lsysfs," ${S}/Makefile
#sed -i -e "s,^LIBDIR[ \t]*= /usr/lib$,LIBDIR = /usr/$(get_libdir)," ${S}/Makefile
echo 'libs: $(LIBHD) $(LIBHD_SO)' >>${S}/Makefile