diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2006-09-29 22:40:15 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2006-09-29 22:40:15 +0000 |
| commit | 16fea7cfe3b3e1d9f20c546f07b45cf1e5700ac5 (patch) | |
| tree | 8ed815aa37813aec7dc830231770345deb6a2131 /sys-apps/hwinfo | |
| parent | removed old versions (diff) | |
| download | gentoo-2-16fea7cfe3b3e1d9f20c546f07b45cf1e5700ac5.tar.gz gentoo-2-16fea7cfe3b3e1d9f20c546f07b45cf1e5700ac5.tar.bz2 gentoo-2-16fea7cfe3b3e1d9f20c546f07b45cf1e5700ac5.zip | |
Fix bugs #142542 and #149531.
(Portage version: 2.1.2_pre1-r4)
Diffstat (limited to 'sys-apps/hwinfo')
| -rw-r--r-- | sys-apps/hwinfo/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/hwinfo/files/hwinfo-13.0-makefile-fixes.patch | 13 | ||||
| -rw-r--r-- | sys-apps/hwinfo/hwinfo-13.0.ebuild | 6 |
3 files changed, 21 insertions, 4 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/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 |