From: Tim Harder Date: Wed, 11 Jan 2012 23:01:24 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d782ee7921efe0665d47f64821525455cb6fd42e;p=gentoo.git Version bump. Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog index a57e6bd0116d..6044d9225c69 100644 --- a/sys-apps/lshw/ChangeLog +++ b/sys-apps/lshw/ChangeLog @@ -1,6 +1,12 @@ # 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.98 2011/11/11 17:23:49 flameeyes Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.99 2012/01/11 23:01:23 radhermit Exp $ + +*lshw-02.16b (11 Jan 2012) + + 11 Jan 2012; Tim Harder +lshw-02.16b.ebuild, + +files/lshw-02.16b-build.patch: + Version bump. 11 Nov 2011; Diego E. Pettenò lshw-02.15b.ebuild: Fix bug #389801, allowing a clean build with [gtk,-sqlite]. diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest index 51dd88c7b769..2da607d26a96 100644 --- a/sys-apps/lshw/Manifest +++ b/sys-apps/lshw/Manifest @@ -1,15 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX lshw-02.15b-build.patch 3735 RMD160 1512c4bc7549c8847bc7beed3564caeaa3f9f9bf SHA1 8006e54aaf79235a2f7fcaba15d1f594dfaa6175 SHA256 1183485aa48e16a99b1a0d4aaa7c48a2d1f0056579334c78090eae2f35cd6a87 +AUX lshw-02.16b-build.patch 3226 RMD160 aed7ebd43f8090ab30f2964809522807d0bc24aa SHA1 4b4c6eafb3bd73dfc2165cec777ccb939ec480ff SHA256 7813d3df67e4f5566fb00bb78a41bef1e9e1dec871c0a624c65e555c12d3a07d DIST lshw-B.02.15.tar.gz 1384466 RMD160 565ea7849fc6ad4ba1368da560a0d1d2000d5b3e SHA1 488b5b014ac06c1d4448f0517f874bcb568c57c0 SHA256 fb01cec64bc9067cce61cd64f8ad81f2f0082985fad5b627cf4bd71ba43735a6 +DIST lshw-B.02.16.tar.gz 1845891 RMD160 8e187990e501acc87208162f166d0671151fd82e SHA1 d2359c79c28568d8b717060314422542b7fd813c SHA256 809882429555b93259785cc261dbff04c16c93d064db5f445a51945bc47157cb EBUILD lshw-02.15b.ebuild 1414 RMD160 de01381b03e4744e86c64dcfdd16649d24761adc SHA1 96c676842e402b4e7e8db5e1f62bee547f2106ff SHA256 e7e164fdc6b0d13ee8541c1d4491defa6230b73d3f8f7898683c3166778f0572 -MISC ChangeLog 11745 RMD160 40e73cf3f14a631e2a0893b6b5e9f22ed361392d SHA1 a9489db609097daede8b7852e928f1b1386bb3f6 SHA256 c43695aafd0ab34c6f9f53ddfd12c4b4611920700c19016afd263e46a2aa7194 +EBUILD lshw-02.16b.ebuild 1316 RMD160 7f7b82be0076238abd63c43e7212fbf44c8771e0 SHA1 92bae56346b1647e569d21de98abd0e0c0ee71f3 SHA256 1393efc2098aed9ccb40afbe749999273343d41bcca1473012f6b7681ad4d45c +MISC ChangeLog 11894 RMD160 02789d4c3f135da2a021d265cc000b9367f9eb7a SHA1 2b68cd2d22bc31fccf6c8f637c49d6ae6dac4104 SHA256 65d94f8e8e1cd15aa39e11da8efc99aa11cafe22e7f05828f9b6675345819b72 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk69WhUACgkQAiZjviIA2XgU+wCg5I2kiO1xu9DP/AVWS+a7uJIC -o8cAoMEnMsU1v8zxwozk+8KOI27VdByG -=Uy1m +iQEcBAEBCgAGBQJPDhTJAAoJEEqz6FtPBkyj6SYH/iHN4jnMxbKCBZgJrd6u/81x +cbiIPq2qKzO+ruDyfdSmuxCOL4bdUfPjZ8Cy3ZQtjyOpO9Idsn2ZlMCrt3y1NBmL +vhszpatSNaFMG/KVnbM9cvTzhOkGqxHj4991dfJEvFOZVJZyNOHUXV3C6FvDTQbK +MZI29crsO3JP8ZSwYkhgGktfRT+QbFQsgA1d3YNPPDL2xdf6KEdcBXZo3npBXNR9 +E8zGbFK8kLBGu2g2+I/xY4pPJetGEQpObj5JRqjn8mUr8r4kCi02QP4f3FgXnU7k +JeU1fFc4FNVFSdXs1l3Yn2iZfvkggoQAWAADBPyL9oKE9lfqiv1+5HXrqnu++Jw= +=aC8l -----END PGP SIGNATURE----- diff --git a/sys-apps/lshw/files/lshw-02.16b-build.patch b/sys-apps/lshw/files/lshw-02.16b-build.patch new file mode 100644 index 000000000000..b0270c4e1363 --- /dev/null +++ b/sys-apps/lshw/files/lshw-02.16b-build.patch @@ -0,0 +1,112 @@ +--- lshw-B.02.16.orig/src/core/Makefile ++++ lshw-B.02.16/src/core/Makefile +@@ -1,10 +1,9 @@ + 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 += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) + LDSTATIC= + LIBS= + +--- lshw-B.02.16.orig/src/gui/Makefile ++++ lshw-B.02.16/src/gui/Makefile +@@ -8,11 +8,10 @@ + 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 += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) + CFLAGS=$(CXXFLAGS) $(DEFINES) + GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-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 +38,6 @@ + $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) + + install: all +- $(STRIP) gtk-$(PACKAGENAME) + + clean: + rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak callbacks.c.bak callbacks.h.bak Makefile.bak +--- lshw-B.02.16.orig/src/Makefile ++++ lshw-B.02.16/src/Makefile +@@ -21,11 +21,11 @@ + CXX?=c++ + INCLUDES=-I./core/ + DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" +-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) ++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) + ifeq ($(SQLITE), 1) + CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) + endif +-LDFLAGS=-L./core/ -g ++LDFLAGS += -L./core/ + ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) + LDFLAGS+= -Wl,--as-needed + endif +@@ -48,18 +48,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 +70,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 +92,14 @@ + manuf.txt: + wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf + +-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) +@@ -112,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.16b.ebuild b/sys-apps/lshw/lshw-02.16b.ebuild new file mode 100644 index 000000000000..3917c751e1f1 --- /dev/null +++ b/sys-apps/lshw/lshw-02.16b.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.16b.ebuild,v 1.1 2012/01/11 23:01:23 radhermit Exp $ + +EAPI=4 +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 ~x86-linux" +IUSE="gtk sqlite static" + +RDEPEND="gtk? ( x11-libs/gtk+:2 ) + sqlite? ( dev-db/sqlite:3 )" +DEPEND="${RDEPEND} + gtk? ( dev-util/pkgconfig ) + sqlite? ( dev-util/pkgconfig )" + +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 all + if use gtk ; then + emake SQLITE=$sqlite gui + fi +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + dodoc README docs/* + if use gtk ; then + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-gui + make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg" + fi +}