diff options
author | Jeroen Roovers <jer@gentoo.org> | 2014-02-05 15:17:29 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2014-02-05 15:17:29 +0000 |
commit | deab4bd60de90ffe3063807ba5734e9dadef4c40 (patch) | |
tree | 8ad56a172c55f1bc9f7761275fae721aa35f528a /x11-misc | |
parent | Fix "xmlwf -h" output using patch from Fedora. (diff) | |
download | historical-deab4bd60de90ffe3063807ba5734e9dadef4c40.tar.gz historical-deab4bd60de90ffe3063807ba5734e9dadef4c40.tar.bz2 historical-deab4bd60de90ffe3063807ba5734e9dadef4c40.zip |
Version bump.
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/xbattbar/ChangeLog | 10 | ||||
-rw-r--r-- | x11-misc/xbattbar/Manifest | 23 | ||||
-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 |
4 files changed, 105 insertions, 12 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/Manifest b/x11-misc/xbattbar/Manifest index ed1fb6a2832a..fe5d07a26e0c 100644 --- a/x11-misc/xbattbar/Manifest +++ b/x11-misc/xbattbar/Manifest @@ -1,15 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 -AUX xbattbar-1.4.3.patch 1206 RMD160 5cf6ea556a013591599be142da9eefeca546465d SHA1 64ce6ff6cd722d89942714bf6879f33e48602b78 SHA256 b84759e1152c5c9988f4e283e08773557b785c91261f022f5cddd8bbf5b49237 -DIST xbattbar_1.4.3.orig.tar.gz 15722 RMD160 92faf39e1a1cec67bd0af8d2af77d18a7296c132 SHA1 6d76fc571b574ef7948429b180f5161ee8668727 SHA256 8f4963bac20836538530a738b7b921543e1381ea01f457c26937efba981292d9 -EBUILD xbattbar-1.4.3.ebuild 1019 RMD160 bfa52dea505bc54aa789701063ad3d9ab84ada91 SHA1 12aaf9b3a8baa86fea2ca1f906221ae340a0d192 SHA256 fd9107d47ea7ee56132d890412da1d0999b6c4438008386f2d7a0a43eb6f5457 -MISC ChangeLog 2036 RMD160 015dfe6a7377c399aea0adb1fb7995b529f29af8 SHA1 e86339e7d58d0545f4c5f71ed80b37a0da8aa6e1 SHA256 8059b584eaf56835166c0d27f075421645fd96205c628e69883e33f265261a00 -MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 +AUX xbattbar-1.4.3.patch 1206 SHA256 b84759e1152c5c9988f4e283e08773557b785c91261f022f5cddd8bbf5b49237 SHA512 e8adf912868b6fef383b9c09783c7a74c74e95446c3d4e37555b2b8cec1d7753ad6ba50de308c51f3a536dc19f616e1bf1363e98153d33e87988ba3fe3d2aa5a WHIRLPOOL 7b24193fc84f86292d8b549d0c69e090f502ca72a658ab7c51ae53b69de0994f401470cac4728dba45f2ca48450f4ef40cd613c3bb4e7237c65873f5254ef4f8 +AUX xbattbar-1.4.4.patch 1355 SHA256 0e282f16ff95235e67584b75f16c5ee82cedb85809e36c2ac3f0209c58f5c2c4 SHA512 7838df8a4de54e0c0e4b934954f3db223257b86936f9555287c3a9e6c5e179bcfee4ebfe2929b3d68a5dba20a0f03cec4b3e83232b8900620a96c490aa99c4dc WHIRLPOOL 2dd694f8514f90808c29ecd7d303239c90a7f42796f40918b213aee82e7ec5b184b33c575f3e7612909bce7044e5b5bdb2489b2f9596e4f7e1424cd8ff51de98 +DIST xbattbar_1.4.3.orig.tar.gz 15722 SHA256 8f4963bac20836538530a738b7b921543e1381ea01f457c26937efba981292d9 +DIST xbattbar_1.4.4.orig.tar.gz 15922 SHA256 2e64855de0cef61f764a7eea81565f7a06fe82492db0b6a09662d6dd93b61448 SHA512 0cd09f4489d9ec551e202fc4791e250c5bf6fdb1801d9025662b79060eb7673c6e43dcf3c352370d42549587dd60879ccad6c6e401f86c7e2a641acbec176aa9 WHIRLPOOL 8eb4b95685ef92c783f9dbe26583cae9189490008630b92d32761548dea603b09cb2c0ed21f463694b7254aea9bd4dc60c835d2207a66812a9d33ef980b72740 +EBUILD xbattbar-1.4.3.ebuild 1019 SHA256 fd9107d47ea7ee56132d890412da1d0999b6c4438008386f2d7a0a43eb6f5457 SHA512 d27b5cff76644ad9b9b8e92bfbd25fe8f2aba4a6196608090dd60f8eca2acf03db1731947f59192acb2d8fb90b620220e41e7e3e6a3a6d19226d1fc6a0342ae8 WHIRLPOOL c0dd1d3e587d0f282385cb29964efe1f2ced528fc319098e248023989cc021b78a623a82deb3b1dfba51cdcc9bba72ee64a20702fea56d9a248a1760a311eb38 +EBUILD xbattbar-1.4.4.ebuild 1062 SHA256 56e9bb900b2687b47864e32b9465cd873ab8c4358327117174331f2ce425ef46 SHA512 3c4f5e262173653052d14c7daee8dd54d764f643cad6935501078eae78426425d73627ea8ed4bfa5815258bef8181a7ea27a48f9e19a7237964dd2e11a607ee8 WHIRLPOOL f94552fd534a5cd9c0f0759b812d63355e32280c3297fdde12f33891dbee45182995de6995ad042a11af57c465ebfc2e91a17d3449a370ad7fb0cdef0a5ea69d +MISC ChangeLog 2186 SHA256 60445cdce46f394e19875ad2c77df3bec7589135713af1135383eef930dd574b SHA512 e208b889a4a8303904e7c2dcc66f07ebfaee668a26752374cb41fa197f98ce991e6630172a80c1952e083d5c04821c7751d0d997e98bbac1fb765dadc82d4141 WHIRLPOOL bc2cdc6ec594ff8587f5d106b217a6af8daf1e32fb845a8e6851d20577c9b89d97b6bf5cd0d001281e752175163d5ed5fe062ebd472dc8860ce7ca5aedcb80c8 +MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iEYEARECAAYFAk891KkACgkQVWmRsqeSphMumwCfWkOND6eE3L/XlsqAYtWW0Cun -nYkAnA0NoyRMSXebWbixmKiZ+oLYjDeE -=G/i9 +iEYEAREIAAYFAlLyVgkACgkQVWmRsqeSphOMagCfdc4hoWY3xBPhDFwwEnqK+jsc +vYkAnjfn+pVU86CreqL31lPqlywVfLC0 +=LZlW -----END PGP SIGNATURE----- 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 +} |