diff options
author | Tim Harder <radhermit@gentoo.org> | 2010-10-28 06:12:54 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2010-10-28 06:12:54 +0000 |
commit | 8182a252b1789873ef1f7b10b49a6298715c19dc (patch) | |
tree | 3709c69d5c32b5c48117a790d62967a6d6ad328e /sys-apps | |
parent | Initial import. Dependency of file-tail. (diff) | |
download | gentoo-2-8182a252b1789873ef1f7b10b49a6298715c19dc.tar.gz gentoo-2-8182a252b1789873ef1f7b10b49a6298715c19dc.tar.bz2 gentoo-2-8182a252b1789873ef1f7b10b49a6298715c19dc.zip |
Version bump. Update to EAPI=3, add sqlite USE flag and dependency, use src_prepare instead of src_unpack, and update build patch.
(Portage version: 2.2_rc98/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/lshw/ChangeLog | 9 | ||||
-rw-r--r-- | sys-apps/lshw/files/lshw-02.15b-build.patch | 119 | ||||
-rw-r--r-- | sys-apps/lshw/lshw-02.15b.ebuild | 52 |
3 files changed, 179 insertions, 1 deletions
diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog index 1e9c2db0f8f7..b76e45a2a7d7 100644 --- a/sys-apps/lshw/ChangeLog +++ b/sys-apps/lshw/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/lshw # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.82 2010/04/11 20:33:36 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.83 2010/10/28 06:12:54 radhermit Exp $ + +*lshw-02.15b (28 Oct 2010) + + 28 Oct 2010; Tim Harder <radhermit@gentoo.org> +lshw-02.15b.ebuild, + +files/lshw-02.15b-build.patch: + Version bump. Update to EAPI=3, add sqlite USE flag and dependency, use + src_prepare instead of src_unpack, and update build patch. 11 Apr 2010; Ryan Hill <dirtyepic@gentoo.org> lshw-02.14b.ebuild, +files/lshw-02.14b-gcc45.patch: diff --git a/sys-apps/lshw/files/lshw-02.15b-build.patch b/sys-apps/lshw/files/lshw-02.15b-build.patch new file mode 100644 index 000000000000..b0ab9f850d19 --- /dev/null +++ b/sys-apps/lshw/files/lshw-02.15b-build.patch @@ -0,0 +1,119 @@ +diff -ur lshw-B.02.15.orig/src/core/Makefile lshw-B.02.15/src/core/Makefile +--- lshw-B.02.15.orig/src/core/Makefile 2010-10-05 02:34:27.000000000 -0700 ++++ lshw-B.02.15/src/core/Makefile 2010-10-27 22:52:25.417069825 -0700 +@@ -1,10 +1,10 @@ + PACKAGENAME?=lshw + +-CXX=c++ ++CXX?=c++ + INCLUDES= + DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" +-CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) +-LDFLAGS= ++CXXFLAGS ?= -g ++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) + LDSTATIC= + LIBS= + +diff -ur lshw-B.02.15.orig/src/gui/Makefile lshw-B.02.15/src/gui/Makefile +--- lshw-B.02.15.orig/src/gui/Makefile 2010-10-05 02:34:27.000000000 -0700 ++++ lshw-B.02.15/src/gui/Makefile 2010-10-27 22:54:54.870258929 -0700 +@@ -8,11 +8,11 @@ + DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" + GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags) + INCLUDES=-I../core $(GTKINCLUDES) +-CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) ++CXXFLAGS ?= -g ++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) + CFLAGS=$(CXXFLAGS) $(DEFINES) + GTKLIBS=$(shell pkg-config gtk+-2.0 --libs) + LIBS=-L../core -llshw -lresolv -lsqlite3 $(GTKLIBS) +-LDFLAGS= + ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) + LDFLAGS+= -Wl,--as-needed + endif +@@ -39,7 +39,6 @@ + $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) + + install: all +- $(STRIP) gtk-$(PACKAGENAME) + + clean: + rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak interface.c.bak interface.h.bak callbacks.c.bak callbacks.h.bak Makefile.bak +diff -ur lshw-B.02.15.orig/src/Makefile lshw-B.02.15/src/Makefile +--- lshw-B.02.15.orig/src/Makefile 2010-10-05 02:34:27.000000000 -0700 ++++ lshw-B.02.15/src/Makefile 2010-10-27 22:53:26.010552033 -0700 +@@ -21,11 +21,13 @@ + CXX?=c++ + INCLUDES=-I./core/ + DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" +-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) ++CXXFLAGS ?= -g ++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) + ifeq ($(SQLITE), 1) + CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) + endif +-LDFLAGS=-L./core/ -g ++LDFLAGS ?= -g ++LDFLAGS += -L./core/ + ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) + LDFLAGS+= -Wl,--as-needed + endif +@@ -48,18 +50,18 @@ + + .PHONY: core + core: +- +make -C core all ++ +$(MAKE) -C core all + + $(PACKAGENAME): core $(PACKAGENAME).o + $(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS) + + .PHONY: po + po: +- +make -C po all ++ +$(MAKE) -C po all + + .PHONY: gui + gui: core +- +make -C gui all ++ +$(MAKE) -C gui all + + .PHONY: nologo + nologo: +@@ -70,7 +72,6 @@ + + $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o + $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS) +- $(STRIP) $@ + + .PHONY: compressed + compressed: $(PACKAGENAME)-compressed +@@ -93,14 +94,14 @@ + manuf.txt: + wget http://www.ethereal.com/distribution/manuf.txt + +-install: all ++install: + $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR) + $(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR) + $(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1 + $(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1 + $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME) + $(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME) +- make -C po install ++ $(MAKE) -C po install + + install-gui: gui + $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR) +@@ -110,8 +111,8 @@ + + clean: + rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed +- make -C core clean +- make -C gui clean ++ $(MAKE) -C core clean ++ $(MAKE) -C gui clean + + .timestamp: + date --utc +%Y%m%d%H%M%S > $@ diff --git a/sys-apps/lshw/lshw-02.15b.ebuild b/sys-apps/lshw/lshw-02.15b.ebuild new file mode 100644 index 000000000000..44b3256bb269 --- /dev/null +++ b/sys-apps/lshw/lshw-02.15b.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2010 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.1 2010/10/28 06:12:54 radhermit Exp $ + +EAPI=3 +inherit flag-o-matic eutils toolchain-funcs + +MAJ_PV=${PV:0:${#PV}-1} +MIN_PVE=${PV:0-1} +MIN_PV=${MIN_PVE/b/B} + +MY_P="$PN-$MIN_PV.$MAJ_PV" +DESCRIPTION="Hardware Lister" +HOMEPAGE="http://ezix.org/project/wiki/HardwareLiSter" +SRC_URI="http://ezix.org/software/files/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="gtk sqlite static" + +DEPEND="gtk? ( >=x11-libs/gtk+-2 ) + sqlite? ( dev-db/sqlite:3 )" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + epatch "${FILESDIR}"/${P}-build.patch +} + +src_compile() { + tc-export CC CXX AR + use static && append-ldflags -static + + local sqlite=0 + use sqlite && sqlite=1 + + emake SQLITE=$sqlite || die "emake failed" + if use gtk ; then + emake gui || die "emake gui failed" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "install failed" + dodoc README docs/* + if use gtk ; then + emake DESTDIR="${D}" install-gui || die "install gui failed" + make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg" + fi +} |