Re: [gentoo-dev] Re: [gentoo-commits] gentoo-x86 commit in x11-plugins/wmbattery: ChangeLog wmbattery-2.42.ebuild wmbattery-2.19-r1.ebuild

[Bernard Cafarelli]

Le 12/02/2014 15:13, Samuli Suominen a écrit :
> On 12/02/14 10:57, Bernard Cafarelli wrote:
>> Le 12/02/2014 1:02, Samuli Suominen a écrit :
>>> On 12/02/14 01:20, Bernard Cafarelli wrote:
>>>> Le Tue, 11 Feb 2014 12:09:14 +0200
>>>> Samuli Suominen <ssuominen@g.o> a écrit:
>>>>> On 11/02/14 11:42, Bernard Cafarelli (voyageur) wrote:
>>>>>> voyageur    14/02/11 09:42:47
>>>>>>
>>>>>>   Modified:             ChangeLog
>>>>>>   Added:                wmbattery-2.42.ebuild
>>>>>>   Removed:              wmbattery-2.19-r1.ebuild
>>>>>>   Log:
>>>>>>   Version bump, adds upower support
>>>>>>
>>>>>>   (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest
>>>>>> commit with key C74525F2)
>>>>>>
>>>>>> Revision  Changes    Path
>>>>>> 1.24                 x11-plugins/wmbattery/ChangeLog
>>>>>>
>>>>>> file :
>>>>>> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmbattery/ChangeLog?rev=1.24&view=markup
>>>>>> plain:
>>>>>> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmbattery/ChangeLog?rev=1.24&content-type=text/plain
>>>>>> diff :
>>>>>> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmbattery/ChangeLog?r1=1.23&r2=1.24
>>>>>>
>>>>>> Index: ChangeLog
>>>>>> ===================================================================
>>>>>> RCS file:
>>>>>> /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v
>>>>>> retrieving revision 1.23
>>>>>> retrieving revision 1.24
>>>>>> diff -u -r1.23 -r1.24
>>>>>> --- ChangeLog    25 Sep 2012 14:08:40 -0000    1.23
>>>>>> +++ ChangeLog    11 Feb 2014 09:42:47 -0000    1.24
>>>>>> @@ -1,6 +1,12 @@
>>>>>>  # ChangeLog for x11-plugins/wmbattery
>>>>>> -# Copyright 1999-2012 Gentoo Foundation; Distributed under the
>>>>>> GPL v2
>>>>>> -# $Header:
>>>>>> /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.23
>>>>>> 2012/09/25 14:08:40 voyageur Exp $
>>>>>> +# Copyright 1999-2014 Gentoo Foundation; Distributed under the
>>>>>> GPL v2
>>>>>> +# $Header:
>>>>>> /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.24
>>>>>> 2014/02/11 09:42:47 voyageur Exp $
>>>>>> +
>>>>>> +*wmbattery-2.42 (11 Feb 2014)
>>>>>> +
>>>>>> +  11 Feb 2014; Bernard Cafarelli <voyageur@g.o>
>>>>>> +  -wmbattery-2.19-r1.ebuild, +wmbattery-2.42.ebuild:
>>>>>> +  Version bump, adds upower support
>>>>>>
>>>>>>  *wmbattery-2.41 (25 Sep 2012)
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>> 1.1                  x11-plugins/wmbattery/wmbattery-2.42.ebuild
>>>>>>
>>>>>> file :
>>>>>> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.42.ebuild?rev=1.1&view=markup
>>>>>> plain:
>>>>>> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.42.ebuild?rev=1.1&content-type=text/plain
>>>>>>
>>>>>> Index: wmbattery-2.42.ebuild
>>>>>> ===================================================================
>>>>>> # Copyright 1999-2014 Gentoo Foundation
>>>>>> # Distributed under the terms of the GNU General Public License v2
>>>>>> # $Header:
>>>>>> /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.42.ebuild,v
>>>>>> 1.1 2014/02/11 09:42:47 voyageur Exp $
>>>>>>
>>>>>> EAPI=5
>>>>>> inherit autotools
>>>>>>
>>>>>> DESCRIPTION="A dockable app to report APM, ACPI, or SPIC battery
>>>>>> status"
>>>>>> HOMEPAGE="http://joeyh.name/code/wmbattery/"
>>>>>> SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.tar.gz"
>>>>>>
>>>>>> LICENSE="GPL-2"
>>>>>> SLOT="0"
>>>>>> KEYWORDS="~amd64 ~ppc -sparc ~x86"
>>>>>> IUSE=""
>>>>>>
>>>>>> DEPEND="sys-apps/apmd
>>>>>>     sys-power/upower
>>>>>>     x11-libs/libX11
>>>>>>     x11-libs/libXext
>>>>>>     x11-libs/libXpm"
>>>>> Are you sure there are no runtime dependencies at all?
>>>>> Futhermore, does it really link against the upower libraries or
>>>>> just
>>>>> call it only at RDEPEND through dbus?
>>>>> In any case, the deps are wrong.
>>>> Nice catch, also present in the previous bump! 2.40 used EAPI 3 so
>>>> it
>>>> had the implicit RDEPEND=${DEPEND}... Fixed in both 2.41 and 2.42
>>>> ebuilds
>>>>
>>>> For upower this new version directly uses upower-glib, so it's a
>>>> build
>>>> dependency
>>>>
>>>
>>> I don't think it's legit to use the upower-glib library without
>>> pkg-config. So I'm pretty sure you are missing build-time-only
>>> dependency of virtual/pkgconfig then too.
>>
>> Indeed:
>>
>> % grep 'pkg-config.*upower'
>> /var/tmp/portage/x11-plugins/wmbattery-2.42/work/wmbattery/Makefile
>> LIBS+=$(shell pkg-config --libs upower-glib)
>>     $(CC) $(CPPFLAGS) $(CFLAGS) $(shell pkg-config --cflags
>> upower-glib) -c upower.c -o upower.o
>>
>> Dependency added, thanks!
>>
>>
>
> One more thing, why does it depend on sys-apps/apmd (which is part of
> the old hotplug base that got replaced by acpi in 1995'ish) ?
> It is really a hardcoded dependency after gained upower support? Seems
> crazy, I don't think APM is used in any modern machines.
> I don't think Linux kernel even supports APM since version 3.3.0
> anymore
> fully...

The original codebase was APM-only (it's a fork from wmapm), with 
support for
optional additional sources (sonypi/HAL/ACPI/...). But the base is still 
APM.

Making it optional would be a nice new upstream feature indeed :)