diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-02 15:59:12 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-02 15:59:12 +0000 |
| commit | 06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (patch) | |
| tree | 8d58c1f4b049da677b33209b072f2b3057268fe0 /x11-misc/xbatt | |
| parent | 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (diff) | |
gentoo resync : 02.03.2018
Diffstat (limited to 'x11-misc/xbatt')
| -rw-r--r-- | x11-misc/xbatt/Manifest | 4 | ||||
| -rw-r--r-- | x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch | 4 | ||||
| -rw-r--r-- | x11-misc/xbatt/xbatt-1.3_rc1.ebuild | 40 |
3 files changed, 25 insertions, 23 deletions
diff --git a/x11-misc/xbatt/Manifest b/x11-misc/xbatt/Manifest index 4abb3328a2a1..121a5970acef 100644 --- a/x11-misc/xbatt/Manifest +++ b/x11-misc/xbatt/Manifest @@ -1,6 +1,6 @@ -AUX xbatt-1.2.1-implicits.patch 297 BLAKE2B 95027e7cef8998bdb7e56e1bea86106d95fe46cc65afab2c54037a7b734752ae505c766e9014f9662514a2a15e69799ade3ed732b0d11254d45b47350162eac7 SHA512 a05010e7e51d2d9ca3d25344c3ed8b3d6c1761660140b7759827e30043ec0af75a444330eeee264df79fa89874886e120469d2f47ef2672471dbc6aed2e0cda4 +AUX xbatt-1.2.1-implicits.patch 301 BLAKE2B 9e7a8b0f2a88ed56857a9f2836f4ac2b916323625e748f6d980d334dd958e6c0c8b442103af5312b1176d386c802d524c1e1b5f0012a18acfc73eb163c247e7f SHA512 defdd56e8a52147afc3f924a1e462bdce4c6200a7300f442a46cc1a4eaaa7ffdc0e52c70683f23774e20e6480c91e094db4f834073c71b1c30a3f4d24c145353 DIST xbatt-1.2.1.tar.gz 12779 BLAKE2B d93d13125d482ebd5b2979033f09ba74526ae8f11d5f4bc88a3ccb0129e3e0ca61e8ca4389c45d789e440389de59939319dd1ef3e03e8e9ca78a61d25b3fc83d SHA512 db96f89e3abecd23532305069806ac094d5a31797f6f730d0f0d5345ac3f339286a5e3bcfc73d42a44a666bcbc768c955b9c3d8ca2fd28bd8239dfa109fe7020 DIST xbatt-1.3pr1.tar.gz 14412 BLAKE2B 7dc44305ac966c41cee8e62a8bcaa0ea991b13b3f126d09c5e80e60bfd4d2becbf57a657d41ee0db36c8a5d9a0366e255c5c893895fd253eb39dcd60a9227b51 SHA512 f6022a2d464e22a31c8246f20c4dcab2be381ec63a02fb9ac1d3e28dc9bdf26a949735b2eba800941f5dfde371913ea7a560413191197c44a0c156a58a60d41d EBUILD xbatt-1.2.1-r1.ebuild 813 BLAKE2B 3d7d54e9bf03f9e541180657b20c46131079cab8c1b89aa9f9c223274c83b7818c31c4366de71c09a4820e85863a23cbd772debd5e8ad67d6c987c67bd9e41d2 SHA512 8e624ad0a2c1ab2d04b04aea873e43e0de259d4ed78c7b70cc85a10f2378e2c98c7a38437709a102f087f410dbd814efdd10bf72635e93a3ddee6abe9ae014f5 -EBUILD xbatt-1.3_rc1.ebuild 920 BLAKE2B 4dffe50f021af3f9ca736bf9a3b86dc029d4dd9242b0315ede5fb372723c9d4e161eb6584ed1f334f3d53e4f3ee672b3749f442022ab4cb1807881577cfa0b61 SHA512 2fe26d597ee3bd90ee45b000eb487182f662b925dc106a868292ef5ee33bdf9ecbbbda9cf25554d283dc95547ab46b5daa06b198bce7c884164802ae54ddda60 +EBUILD xbatt-1.3_rc1.ebuild 886 BLAKE2B 6afda908181c801810ef0e2d12b4722090dc337d84caf2d43db84115c78171651a1ffd88ba238830824bfc4cfee0885d7ee0e25fe77111d65eab49005391afe4 SHA512 b87b1609eea09b05e0c8f6f6e979a4416dca070001213dff38adde546932f9b332f7f9bd0c8cd01974022809f0db63017b0d365ddc8967f2d3820de7e739363d MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b diff --git a/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch b/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch index d86e42ef3fc8..5e135d5c313a 100644 --- a/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch +++ b/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch @@ -1,7 +1,7 @@ Fix implicit functions declarations ---- xbatt.c -+++ xbatt.c +--- a/xbatt.c ++++ b/xbatt.c @@ -47,6 +47,9 @@ #include <time.h> #include <sys/file.h> diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild index a3d3a1f562f4..f291714e25c9 100644 --- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild +++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 - -inherit versionator eutils toolchain-funcs +EAPI=6 +inherit toolchain-funcs versionator MY_PV=${PV/_rc/pr} DESCRIPTION="Notebook battery indicator for X" @@ -13,32 +12,35 @@ SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${PN}-${MY_PV}.tar.gz" LICENSE="xbatt" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND="x11-libs/libX11 +RDEPEND=" + x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-libs/libxkbfile - x11-libs/libXpm" -DEPEND="${RDEPEND} + x11-libs/libXpm +" +DEPEND=" + ${RDEPEND} x11-proto/xextproto - x11-misc/imake" - + x11-misc/imake +" +PATCHES=( + "${FILESDIR}"/${PN}-1.2.1-implicits.patch +) S="${WORKDIR}"/${PN}-$(get_version_component_range 1-2) -src_prepare(){ - epatch "${FILESDIR}"/${PN}-1.2.1-implicits.patch -} - src_compile() { xmkmf || die - emake xbatt CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \ - EXTRA_LDOPTIONS="${LDFLAGS}" || die + emake \ + CC="$(tc-getCC)" \ + CDEBUGFLAGS="${CFLAGS}" \ + EXTRA_LDOPTIONS="${LDFLAGS}" \ + xbatt } src_install() { - emake DESTDIR="${D}" install || die - dodoc README* || die + emake DESTDIR="${D}" install + dodoc README* } |