diff options
author | Jeroen Roovers <jer@gentoo.org> | 2014-02-05 15:17:28 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2014-02-05 15:17:28 +0000 |
commit | 3893bb4cc7af2f58a212243ce078b44e34386f6a (patch) | |
tree | d87afa53fda88dcc8fb402c5d67c184c42669bad /x11-misc | |
parent | Fix "xmlwf -h" output using patch from Fedora. (diff) | |
download | gentoo-2-3893bb4cc7af2f58a212243ce078b44e34386f6a.tar.gz gentoo-2-3893bb4cc7af2f58a212243ce078b44e34386f6a.tar.bz2 gentoo-2-3893bb4cc7af2f58a212243ce078b44e34386f6a.zip |
Version bump.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/xbattbar/ChangeLog | 10 | ||||
-rw-r--r-- | x11-misc/xbattbar/files/xbattbar-1.4.4.patch | 40 | ||||
-rw-r--r-- | x11-misc/xbattbar/xbattbar-1.4.4.ebuild | 44 |
3 files changed, 92 insertions, 2 deletions
diff --git a/x11-misc/xbattbar/ChangeLog b/x11-misc/xbattbar/ChangeLog index 2d463985bff4..7a12220d67cc 100644 --- a/x11-misc/xbattbar/ChangeLog +++ b/x11-misc/xbattbar/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/xbattbar -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbattbar/ChangeLog,v 1.16 2012/02/17 04:16:36 jer Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbattbar/ChangeLog,v 1.17 2014/02/05 15:17:27 jer Exp $ + +*xbattbar-1.4.4 (05 Feb 2014) + + 05 Feb 2014; Jeroen Roovers <jer@gentoo.org> +xbattbar-1.4.4.ebuild, + +files/xbattbar-1.4.4.patch: + Version bump. 17 Feb 2012; Jeroen Roovers <jer@gentoo.org> -xbattbar-1.4.2.ebuild: Old. diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.4.patch b/x11-misc/xbattbar/files/xbattbar-1.4.4.patch new file mode 100644 index 000000000000..0a17a4cd1a5e --- /dev/null +++ b/x11-misc/xbattbar/files/xbattbar-1.4.4.patch @@ -0,0 +1,40 @@ +--- a/Makefile ++++ b/Makefile +@@ -8,16 +8,16 @@ + all: $(TARGET) $(APM_CHECK) + + $(TARGET): obj/xbattbar.o +- gcc -o $@ $< -lX11 ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lX11 + + obj/xbattbar.o: xbattbar.c obj/stamp +- gcc -MMD -o $@ -c $< ++ $(CC) $(LDFLAGS) $(CFLAGS) -MMD -o $@ -c $< + + $(APM_CHECK): obj/xbattbar-check-apm.o +- gcc -o $@ $< ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< + + obj/xbattbar-check-apm.o: xbattbar-check-apm.c obj/stamp +- gcc -MMD -D$(OS_TYPE) -o $@ -c $< ++ $(CC) $(LDFLAGS) $(CFLAGS) -MMD -D$(OS_TYPE) -o $@ -c $< + + obj/stamp: + mkdir obj +@@ -29,12 +29,12 @@ + + + install: $(TARGET) $(APM_CHECK) +- install -d -m 0755 $(DESTDIR)/usr/lib/$(PROJECT) ++ install -d -m 0755 $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT) + install -d -m 0755 $(DESTDIR)/usr/bin + install -d -m 0755 $(DESTDIR)/usr/share/man/man1 +- install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/lib/$(PROJECT)/ +- install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/lib/$(PROJECT)/ +- install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/lib/$(PROJECT)/ ++ install -m 0755 $(APM_CHECK) $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/ ++ install -m 0755 xbattbar-check-acpi $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/ ++ install -m 0755 xbattbar-check-sys $(DESTDIR)/usr/$(LIBDIR)/$(PROJECT)/ + install -m 0755 $(TARGET) $(DESTDIR)/usr/bin/ + install -m 0644 xbattbar.man $(DESTDIR)/usr/share/man/man1/$(PROJECT).1 + diff --git a/x11-misc/xbattbar/xbattbar-1.4.4.ebuild b/x11-misc/xbattbar/xbattbar-1.4.4.ebuild new file mode 100644 index 000000000000..0c4eabcf3424 --- /dev/null +++ b/x11-misc/xbattbar/xbattbar-1.4.4.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbattbar/xbattbar-1.4.4.ebuild,v 1.1 2014/02/05 15:17:27 jer Exp $ + +EAPI=5 +PYTHON_COMPAT=( python2_{6,7} ) +inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs + +DESCRIPTION="Advanced Power Management battery status display for X" +HOMEPAGE="http://packages.qa.debian.org/x/xbattbar.html" +SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +DEPEND=" + dev-lang/perl + x11-libs/libX11 +" +RDEPEND=" + ${DEPEND} + ${PYTHON_DEPS} + !ppc? ( >=sys-power/acpi-1.5 ) +" # ppc has APM + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.4.4.patch + + sed -i \ + -e "s:usr/lib:usr/$(get_libdir):" \ + xbattbar.c || die +} + +src_compile() { + use kernel_linux && append-flags -Dlinux + emake CC=$(tc-getCC) LIBDIR="$(get_libdir)" + python_fix_shebang ${PN}-check-sys +} + +src_install() { + emake install DESTDIR="${D}" LIBDIR="$(get_libdir)" + dodoc README +} |