Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: eclass/

[Luca Barbato]

On 18/04/16 00:50, Anthony G. Basile wrote:

> Does base-system object if I bump it to EAPI=5 before I commit the
> ssl-cert patch?  I'll start stabilization too obviously.
> 

Please do.

[gentoo-dev] Automated Package Removal and Addition Tracker, for the week ending 2016-04-17 23:59 UTC

[Robin H. Johnson]

The attached list notes all of the packages that were added or removed
from the tree, for the week ending 2016-04-17 23:59 UTC.

Removals:
app-admin/packagekit-qt420160416-11:47 johu   c4ba182
dev-dotnet/ikvm 20160414-19:03 chewi  d1bf109
dev-java/apple-jdk-bin  20160414-19:36 chewi  51315d8
dev-java/hp-jdk-bin 20160414-19:41 chewi  53e0057
dev-java/ibm-jdk-bin20160414-19:56 chewi  c81802f
dev-java/ibm-jre-bin20160414-19:49 chewi  dafea89
dev-java/jcharts20160414-19:03 chewi  7306574
dev-java/soylatte-jdk-bin   20160414-19:27 chewi  3c2fde9
dev-java/sun-jce-bin20160414-19:22 chewi  d200df3
dev-java/sun-jdk20160414-19:25 chewi  f688f20
dev-java/sun-jre-bin20160414-19:24 chewi  321c74b
dev-perl/set-scalar 20160412-15:58 dilfridge  405fdee
dev-perl/string-crc32   20160412-18:29 dilfridge  c08adde
dev-tex/fundus  20160414-19:39 kensington b1483f2
dev-tex/xymtex  20160414-19:39 kensington 3929831
dev-vcs/statcvs 20160414-15:05 monsieurp  597d54b
dev-vcs/statsvn 20160414-15:05 monsieurp  597d54b
kde-base/khelpcenter20160415-15:22 johu   0d01065
kde-plasma/khelpcenter  20160415-16:03 johu   bbd3c42

Additions:
app-admin/packagekit-qt 20160416-11:47 johu   c4ba182
app-crypt/signify   20160417-11:03 patrickf328257
app-doc/cppman  20160415-15:18 monsieurp  a4a268c
app-emulation/containerd20160417-16:35 xarthisius bf4e693
app-text/cherrytree 20160415-16:44 monsieurp  1561088
app-text/grip   20160415-17:56 monsieurp  1759910
dev-perl/Devel-CheckBin 20160410-15:27 dilfridge  95fdd11
dev-perl/MCE20160415-15:43 dilfridge  d9ab683
dev-perl/multidimensional   20160410-17:41 dilfridge  926663f
dev-perl/Set-Scalar 20160412-15:46 dilfridge  53d4075
dev-perl/String-CRC32   20160412-17:26 dilfridge  677c2ac
dev-perl/SUPER  20160415-15:19 dilfridge  73835bd
dev-perl/Text-Soundex   20160410-04:33 dilfridge  ce24458
dev-python/httpauth 20160412-12:56 monsieurp  baba4be
dev-python/humanize 20160412-12:59 monsieurp  ea12b47
dev-python/path-and-address 20160415-17:59 monsieurp  dd397f7
dev-python/py2-ipaddress20160417-17:37 alunduil   6b29c7d
dev-python/python-ctags 20160413-12:41 idella4cd49980
dev-python/superlance   20160415-12:45 idella49edad3e
dev-util/bcc20160411-07:26 zmedico0934d91
kde-apps/khelpcenter20160415-15:22 johu   0d01065
mail-filter/postsrsd20160413-14:11 djc6513c93
net-irc/quassel-irssi   20160413-13:09 wraeth 7728929
net-misc/peervpn20160411-10:41 zmedico5634d7b
sci-astronomy/esomidas  20160415-00:17 bicatali   1876696
sys-libs/uclibc-ng  20160413-00:05 blueness   6714d08
www-apps/icingaweb2-module-graphite 20160411-20:45 prometheanfire 6404d33
www-apps/klaus  20160412-13:09 monsieurp  d33e44f

--
Robin Hugh Johnson
Gentoo Linux Developer
E-Mail : robb...@gentoo.org
GnuPG FP   : 11AC BA4F 4778 E3F6 E4ED  F38E B27B 944E 3488 4E85
Removed Packages:
app-admin/packagekit-qt4,removed,johu,20160416-11:47,c4ba182
dev-perl/string-crc32,removed,dilfridge,20160412-18:29,c08adde
dev-perl/set-scalar,removed,dilfridge,20160412-15:58,405fdee
kde-plasma/khelpcenter,removed,johu,20160415-16:03,bbd3c42
kde-base/khelpcenter,removed,johu,20160415-15:22,0d01065
dev-java/ibm-jdk-bin,removed,chewi,20160414-19:56,c81802f
dev-java/ibm-jre-bin,removed,chewi,20160414-19:49,dafea89
dev-java/hp-jdk-bin,removed,chewi,20160414-19:41,53e0057
dev-java/apple-jdk-bin,removed,chewi,20160414-19:36,51315d8
dev-java/soylatte-jdk-bin,removed,chewi,20160414-19:27,3c2fde9
dev-java/sun-jdk,removed,chewi,20160414-19:25,f688f20
dev-java/sun-jre-bin,removed,chewi,20160414-19:24,321c74b
dev-java/sun-jce-bin,removed,chewi,20160414-19:22,d200df3
dev-dotnet/ikvm,removed,chewi,20160414-19:03,d1bf109
dev-java/jcharts,removed,chewi,20160414-19:03,7306574
dev-tex/xymtex,removed,kensington,20160414-19:39,3929831
dev-tex/fundus,removed,kensington,20160414-19:39,b1483f2
dev-vcs/statcvs,removed,monsieurp,20160414-15:05,597d54b
dev-vcs/statsvn,removed,monsieurp,20160414-15:05,597d54b
Added Packages:
dev-python/py2-ipaddress,added,alunduil,20160417-17:37,6b29c7d
app-emulation/containerd

Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: eclass/

[Anthony G. Basile]

On 4/17/16 4:28 AM, Anthony G. Basile wrote:
> On 4/17/16 4:15 AM, Fabian Groffen wrote:
>> On 16-04-2016 21:05:56 +0200, Michał Górny wrote:
>>> Congratulations! You've just committed an invalid dependency that is
>>> going to cause true mayhem on every package using the eclass.
>>
>> I assume you've taken proper actions to mitigate this.
>>
>>> But why would anyone send patches for review, or even start wondering
>>> that we might be using USE=libressl all around for some reason...
>>
>> While I believe your point is right (patches for review), I think this
>> style of communication is unnecessary.
> 
> In case you haven't been following the other communications regarding
> the matter, the USE flag is not necessary here because ssl-cert.eclass
> does not involve any linking against openssl/libressl.  So I'll be
> recommitting the original patch without the slot operator.
> 
> The original patch is at
> 
> https://gitweb.gentoo.org/repo/gentoo.git/commit/eclass/ssl-cert.eclass?id=7a4d6bd5fcb25d8381bc08e20ad6a5c1c80ad78f
> 
> plus s/:0=/:0/
> 
>>
>> Thanks,
>> Fabian
>>
> 
> 

mgorny suggested that i look for any EAPI=0 ebuild inheriting
ssl-cert.eclass.  I hacked up the following:

import portage

portdb = portage.db["/"]["porttree"].dbapi
gentoo_repo_location = portdb.repositories["gentoo"].location

for cp in portdb.cp_all(trees=[gentoo_repo_location]):
for cpv in portdb.cp_list(cp, mytree=gentoo_repo_location):
eapi, inherited = portdb.aux_get(cpv, ["EAPI", "INHERITED"],
myrepo="gentoo")
if eapi == '0' and 'ssl-cert' in inherited.split():
print(cpv)

and found net-ftp/netkit-ftpd-0.17-r8.  Its pretty ancient and belongs
to base system.

Does base-system object if I bump it to EAPI=5 before I commit the
ssl-cert patch?  I'll start stabilization too obviously.

-- 
Anthony G. Basile, Ph.D.
Gentoo Linux Developer [Hardened]
E-Mail: bluen...@gentoo.org
GnuPG FP  : 1FED FAD9 D82C 52A5 3BAB  DC79 9384 FA6E F52D 4BBA
GnuPG ID  : F52D4BBA

Re: [gentoo-dev] [PATCH 0/7] Dropping autotools-utils from xorg-2

[Mike Gilbert]

On Sun, Apr 17, 2016 at 12:24 PM, Michał Górny  wrote:
> On Sun, 17 Apr 2016 10:37:35 -0400
> Ian Stakenvicius  wrote:
>
>> > On Apr 17, 2016, at 10:13 AM, Mike Gilbert  wrote:
>> >
>> > The xorg-2 eclass currently uses the deprecated autotools-utils and
>> > autotools-multilib eclasses, which are banned in EAPI 6.
>> >
>> > This patchset attempts to remove any trace of autotools-utils from ebuilds
>> > using xorg-2.
>> >
>> > Note that I am touching stable ebuilds here to avoid forking an "xorg-3"
>> > eclass. If there is a strong feeling that this is too dangerous, I can 
>> > alter
>> > my approach. I have build tested most packages using xorg-2, and only a few
>> > had issues.
>> >
>>
>> Although I commend you for these efforts, given that this deprecation is 
>> also linked to EAPI6, why not instead bump to XORG-3 requiring EAPI6, take 
>> advantage of all the simplifications, and this will allow/enforce migration 
>> of all the ebuilds as well in turn?
>>
>> It would be nice for instance to drop the epatch stuffs at the same time, if 
>> we could...
>
> +1. This is really a good point to look again at what exactly needs to
> be in the eclass, and clean everything up.

Ok, I'll leave xorg-2 alone for the time being. Thanks for the feedback.

[gentoo-dev] Last rites: dev-java/freehep-*

[Patrice Clement]

# Patrice Clement  (17 Apr 2016)
# Unmaintained ebuilds (EAPI 0!) which don't compile with Java 8.
# Removal in 30 days. See bug 580094.
dev-java/freehep-export
dev-java/freehep-graphics2d
dev-java/freehep-graphicsio
dev-java/freehep-graphicsio-emf
dev-java/freehep-graphicsio-java
dev-java/freehep-graphicsio-pdf
dev-java/freehep-graphicsio-ps
dev-java/freehep-graphicsio-svg
dev-java/freehep-graphicsio-swf
dev-java/freehep-graphicsio-tests
dev-java/freehep-io
dev-java/freehep-mcfio
dev-java/freehep-misc-deps
dev-java/freehep-parameterdatabase
dev-java/freehep-record
dev-java/freehep-rootio
dev-java/freehep-rtti
dev-java/freehep-sio
dev-java/freehep-stdhep
dev-java/freehep-swing
dev-java/freehep-util
dev-java/freehep-xdr
dev-java/freehep-xml

-- 
Patrice Clement
Gentoo Linux developer
http://www.gentoo.org


signature.asc
Description: PGP signature

Re: [gentoo-dev] [PATCH 1/7] xorg-2.eclass: drop autotools-utils

[Michał Górny]

On Sun, 17 Apr 2016 10:45:08 -0400
Mike Gilbert  wrote:

> On Sun, Apr 17, 2016 at 10:31 AM, Ian Stakenvicius  wrote:
> >
> >
> > Sent from an iPhone, sorry for the HTML...
> >  
> >> On Apr 17, 2016, at 10:13 AM, Mike Gilbert  wrote:
> >>
> >> @@ -487,10 +497,17 @@ xorg-2_src_configure() {
> >> xorg-2_src_compile() {
> >>debug-print-function ${FUNCNAME} "$@"
> >>
> >> +local makeargs=( "$@" )
> >> +
> >>if [[ ${XORG_MULTILIB} == yes ]]; then
> >> -autotools-multilib_src_compile "$@"
> >> +if ! declare -f multilib_src_compile >/dev/null; then
> >> +multilib_src_compile() {
> >> +emake "${makeargs[@]}"
> >> +}
> >> +fi
> >> +multilib-minimal_src_compile
> >>else
> >> -autotools-utils_src_compile "$@"
> >> +emake "${makeargs[@]}"
> >>fi
> >> }  
> >
> > Does the src_compile code need to be as complex as this?  Why not just a 
> > 'if $XORG_MULTILIB ; then multilib-minimal_src_compile "$@"; else emake 
> > "$@"; fi '?
> >
> > ...or even 'default' instead of emake...?  
> 
> multilib-mininmal_src_compile and default_src_comple do not provide
> any method to pass arguments to emake. If I recall correctly, there is
> at least one ebuild that needs to do so.

I'd say the EAPI approach (employed by multilib-minimal as well) would
be to redefine multilib_src_compile() in that ebuild rather than
complexifying the generic case.

-- 
Best regards,
Michał Górny



pgpKa_DAM50hi.pgp
Description: OpenPGP digital signature

Re: [gentoo-dev] [PATCH 0/7] Dropping autotools-utils from xorg-2

[Michał Górny]

On Sun, 17 Apr 2016 10:37:35 -0400
Ian Stakenvicius  wrote:

> > On Apr 17, 2016, at 10:13 AM, Mike Gilbert  wrote:
> > 
> > The xorg-2 eclass currently uses the deprecated autotools-utils and
> > autotools-multilib eclasses, which are banned in EAPI 6.
> > 
> > This patchset attempts to remove any trace of autotools-utils from ebuilds
> > using xorg-2.
> > 
> > Note that I am touching stable ebuilds here to avoid forking an "xorg-3"
> > eclass. If there is a strong feeling that this is too dangerous, I can alter
> > my approach. I have build tested most packages using xorg-2, and only a few
> > had issues.
> >   
> 
> Although I commend you for these efforts, given that this deprecation is also 
> linked to EAPI6, why not instead bump to XORG-3 requiring EAPI6, take 
> advantage of all the simplifications, and this will allow/enforce migration 
> of all the ebuilds as well in turn?
> 
> It would be nice for instance to drop the epatch stuffs at the same time, if 
> we could...

+1. This is really a good point to look again at what exactly needs to
be in the eclass, and clean everything up.

-- 
Best regards,
Michał Górny



pgpanyA7twWbl.pgp
Description: OpenPGP digital signature

Re: [gentoo-dev] [PATCH 1/7] xorg-2.eclass: drop autotools-utils

[Mike Gilbert]

On Sun, Apr 17, 2016 at 10:50 AM, Ian Stakenvicius  wrote:
>
>> On Apr 17, 2016, at 10:45 AM, Mike Gilbert  wrote:
>>
>>> On Sun, Apr 17, 2016 at 10:31 AM, Ian Stakenvicius  wrote:
>>>
>>>
>>> Sent from an iPhone, sorry for the HTML...
>>>
 On Apr 17, 2016, at 10:13 AM, Mike Gilbert  wrote:

 @@ -487,10 +497,17 @@ xorg-2_src_configure() {
 xorg-2_src_compile() {
   debug-print-function ${FUNCNAME} "$@"

 +local makeargs=( "$@" )
 +
   if [[ ${XORG_MULTILIB} == yes ]]; then
 -autotools-multilib_src_compile "$@"
 +if ! declare -f multilib_src_compile >/dev/null; then
 +multilib_src_compile() {
 +emake "${makeargs[@]}"
 +}
 +fi
 +multilib-minimal_src_compile
   else
 -autotools-utils_src_compile "$@"
 +emake "${makeargs[@]}"
   fi
 }
>>>
>>> Does the src_compile code need to be as complex as this?  Why not just a 
>>> 'if $XORG_MULTILIB ; then multilib-minimal_src_compile "$@"; else emake 
>>> "$@"; fi '?
>>>
>>> ...or even 'default' instead of emake...?
>>
>> multilib-mininmal_src_compile and default_src_comple do not provide
>> any method to pass arguments to emake. If I recall correctly, there is
>> at least one ebuild that needs to do so.
>>
>
> That would do it then...
>
> mgorny how difficult do you think it would be to pass extra "$@" bits through 
> to the default multilib_src_compile?  Or does that just call 'default' too... 
>  (can't check right now)
>

If multilib_src_compile is undefined, mutlilib-minimal_src_compile
calls default_src_compile.

Re: [gentoo-dev] [PATCH 0/7] Dropping autotools-utils from xorg-2

[Mike Gilbert]

On Sun, Apr 17, 2016 at 10:37 AM, Ian Stakenvicius  wrote:
>
>> On Apr 17, 2016, at 10:13 AM, Mike Gilbert  wrote:
>>
>> The xorg-2 eclass currently uses the deprecated autotools-utils and
>> autotools-multilib eclasses, which are banned in EAPI 6.
>>
>> This patchset attempts to remove any trace of autotools-utils from ebuilds
>> using xorg-2.
>>
>> Note that I am touching stable ebuilds here to avoid forking an "xorg-3"
>> eclass. If there is a strong feeling that this is too dangerous, I can alter
>> my approach. I have build tested most packages using xorg-2, and only a few
>> had issues.
>>
>
> Although I commend you for these efforts, given that this deprecation is also 
> linked to EAPI6, why not instead bump to XORG-3 requiring EAPI6, take 
> advantage of all the simplifications, and this will allow/enforce migration 
> of all the ebuilds as well in turn?
>
> It would be nice for instance to drop the epatch stuffs at the same time, if 
> we could...
>

If the x11 team wants to go that way, that's fine. It's just a lot
more work to update all the ebuilds, so I would need people to help
out.

Re: [gentoo-dev] [PATCH 1/7] xorg-2.eclass: drop autotools-utils

[Ian Stakenvicius]

> On Apr 17, 2016, at 10:45 AM, Mike Gilbert  wrote:
> 
>> On Sun, Apr 17, 2016 at 10:31 AM, Ian Stakenvicius  wrote:
>> 
>> 
>> Sent from an iPhone, sorry for the HTML...
>> 
>>> On Apr 17, 2016, at 10:13 AM, Mike Gilbert  wrote:
>>> 
>>> @@ -487,10 +497,17 @@ xorg-2_src_configure() {
>>> xorg-2_src_compile() {
>>>   debug-print-function ${FUNCNAME} "$@"
>>> 
>>> +local makeargs=( "$@" )
>>> +
>>>   if [[ ${XORG_MULTILIB} == yes ]]; then
>>> -autotools-multilib_src_compile "$@"
>>> +if ! declare -f multilib_src_compile >/dev/null; then
>>> +multilib_src_compile() {
>>> +emake "${makeargs[@]}"
>>> +}
>>> +fi
>>> +multilib-minimal_src_compile
>>>   else
>>> -autotools-utils_src_compile "$@"
>>> +emake "${makeargs[@]}"
>>>   fi
>>> }
>> 
>> Does the src_compile code need to be as complex as this?  Why not just a 'if 
>> $XORG_MULTILIB ; then multilib-minimal_src_compile "$@"; else emake "$@"; fi 
>> '?
>> 
>> ...or even 'default' instead of emake...?
> 
> multilib-mininmal_src_compile and default_src_comple do not provide
> any method to pass arguments to emake. If I recall correctly, there is
> at least one ebuild that needs to do so.
> 

That would do it then...  

mgorny how difficult do you think it would be to pass extra "$@" bits through 
to the default multilib_src_compile?  Or does that just call 'default' too...  
(can't check right now)

Re: [gentoo-dev] [PATCH 1/7] xorg-2.eclass: drop autotools-utils

[Mike Gilbert]

On Sun, Apr 17, 2016 at 10:31 AM, Ian Stakenvicius  wrote:
>
>
> Sent from an iPhone, sorry for the HTML...
>
>> On Apr 17, 2016, at 10:13 AM, Mike Gilbert  wrote:
>>
>> @@ -487,10 +497,17 @@ xorg-2_src_configure() {
>> xorg-2_src_compile() {
>>debug-print-function ${FUNCNAME} "$@"
>>
>> +local makeargs=( "$@" )
>> +
>>if [[ ${XORG_MULTILIB} == yes ]]; then
>> -autotools-multilib_src_compile "$@"
>> +if ! declare -f multilib_src_compile >/dev/null; then
>> +multilib_src_compile() {
>> +emake "${makeargs[@]}"
>> +}
>> +fi
>> +multilib-minimal_src_compile
>>else
>> -autotools-utils_src_compile "$@"
>> +emake "${makeargs[@]}"
>>fi
>> }
>
> Does the src_compile code need to be as complex as this?  Why not just a 'if 
> $XORG_MULTILIB ; then multilib-minimal_src_compile "$@"; else emake "$@"; fi 
> '?
>
> ...or even 'default' instead of emake...?

multilib-mininmal_src_compile and default_src_comple do not provide
any method to pass arguments to emake. If I recall correctly, there is
at least one ebuild that needs to do so.

Re: [gentoo-dev] [PATCH 0/7] Dropping autotools-utils from xorg-2

[Ian Stakenvicius]

> On Apr 17, 2016, at 10:13 AM, Mike Gilbert  wrote:
> 
> The xorg-2 eclass currently uses the deprecated autotools-utils and
> autotools-multilib eclasses, which are banned in EAPI 6.
> 
> This patchset attempts to remove any trace of autotools-utils from ebuilds
> using xorg-2.
> 
> Note that I am touching stable ebuilds here to avoid forking an "xorg-3"
> eclass. If there is a strong feeling that this is too dangerous, I can alter
> my approach. I have build tested most packages using xorg-2, and only a few
> had issues.
> 

Although I commend you for these efforts, given that this deprecation is also 
linked to EAPI6, why not instead bump to XORG-3 requiring EAPI6, take advantage 
of all the simplifications, and this will allow/enforce migration of all the 
ebuilds as well in turn?

It would be nice for instance to drop the epatch stuffs at the same time, if we 
could...

Re: [gentoo-dev] [PATCH 1/7] xorg-2.eclass: drop autotools-utils

[Ian Stakenvicius]

Sent from an iPhone, sorry for the HTML...

> On Apr 17, 2016, at 10:13 AM, Mike Gilbert  wrote:
> 
> @@ -487,10 +497,17 @@ xorg-2_src_configure() {
> xorg-2_src_compile() {
>debug-print-function ${FUNCNAME} "$@"
> 
> +local makeargs=( "$@" )
> +
>if [[ ${XORG_MULTILIB} == yes ]]; then
> -autotools-multilib_src_compile "$@"
> +if ! declare -f multilib_src_compile >/dev/null; then
> +multilib_src_compile() {
> +emake "${makeargs[@]}"
> +}
> +fi
> +multilib-minimal_src_compile
>else
> -autotools-utils_src_compile "$@"
> +emake "${makeargs[@]}"
>fi
> }

Does the src_compile code need to be as complex as this?  Why not just a 'if 
$XORG_MULTILIB ; then multilib-minimal_src_compile "$@"; else emake "$@"; fi '? 
 

...or even 'default' instead of emake...?

[gentoo-dev] [PATCH 7/7] x11-libs/xpyb: set XORG_EAUTORECONF instead of AUTOTOOLS_AUTORECONF

[Mike Gilbert]

Package-Manager: portage-2.2.28_p66
---
 x11-libs/xpyb/xpyb-1.3.1-r2.ebuild | 4 ++--
 x11-libs/xpyb/xpyb-1.3.1-r3.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-libs/xpyb/xpyb-1.3.1-r2.ebuild 
b/x11-libs/xpyb/xpyb-1.3.1-r2.ebuild
index c563aa3..50243a4 100644
--- a/x11-libs/xpyb/xpyb-1.3.1-r2.ebuild
+++ b/x11-libs/xpyb/xpyb-1.3.1-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=1
+XORG_EAUTORECONF=yes
 
 inherit flag-o-matic xorg-2 python-r1
 
diff --git a/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild 
b/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild
index 0cb8e96..34c520d 100644
--- a/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild
+++ b/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=1
+XORG_EAUTORECONF=yes
 
 inherit flag-o-matic xorg-2 python-r1
 
-- 
2.8.1

[gentoo-dev] [PATCH 5/7] x11-apps/xauth: drop autotools-utils

[Mike Gilbert]

Package-Manager: portage-2.2.28_p66
---
 x11-apps/xauth/xauth-1.0.9-r1.ebuild | 7 ---
 x11-apps/xauth/xauth-1.0.9-r2.ebuild | 7 ---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/x11-apps/xauth/xauth-1.0.9-r1.ebuild 
b/x11-apps/xauth/xauth-1.0.9-r1.ebuild
index ed1c75e..38553ba 100644
--- a/x11-apps/xauth/xauth-1.0.9-r1.ebuild
+++ b/x11-apps/xauth/xauth-1.0.9-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=4
 
-inherit autotools-utils xorg-2
+inherit xorg-2
 
 DESCRIPTION="X authority file utility"
 
@@ -30,6 +30,7 @@ src_configure() {
 
 src_test() {
# Address sandbox failure, bug #527574
+   local -x SANDBOX_WRITE=${SANDBOX_WRITE}
addwrite /proc/self/comm
-   autotools-utils_src_test
+   default
 }
diff --git a/x11-apps/xauth/xauth-1.0.9-r2.ebuild 
b/x11-apps/xauth/xauth-1.0.9-r2.ebuild
index 6e13214..9079f66 100644
--- a/x11-apps/xauth/xauth-1.0.9-r2.ebuild
+++ b/x11-apps/xauth/xauth-1.0.9-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=4
 
-inherit autotools-utils xorg-2
+inherit xorg-2
 
 DESCRIPTION="X authority file utility"
 
@@ -29,6 +29,7 @@ src_configure() {
 
 src_test() {
# Address sandbox failure, bug #527574
+   local -x SANDBOX_WRITE=${SANDBOX_WRITE}
addwrite /proc/self/comm
-   autotools-utils_src_test
+   default
 }
-- 
2.8.1

[gentoo-dev] [PATCH 6/7] x11-libs/glamor: drop autotools-utils

[Mike Gilbert]

Package-Manager: portage-2.2.28_p66
---
 x11-libs/glamor/glamor-0.6.0-r1.ebuild | 6 +++---
 x11-libs/glamor/glamor-0.6.0.ebuild| 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x11-libs/glamor/glamor-0.6.0-r1.ebuild 
b/x11-libs/glamor/glamor-0.6.0-r1.ebuild
index 453e142..389d98c 100644
--- a/x11-libs/glamor/glamor-0.6.0-r1.ebuild
+++ b/x11-libs/glamor/glamor-0.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ XORG_MODULE=driver/
 XORG_MODULE_REBUILD=yes
 S=${WORKDIR}/${PN}-egl-${PV}
 
-inherit xorg-2 autotools-utils toolchain-funcs
+inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="OpenGL based 2D rendering acceleration library"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${PN}-egl-${PV}.tar.bz2"
@@ -50,5 +50,5 @@ src_prepare() {
 
 src_install() {
# workaround parallel install failure, bug #488124.
-   autotools-utils_src_install -j1
+   xorg-2_src_install -j1
 }
diff --git a/x11-libs/glamor/glamor-0.6.0.ebuild 
b/x11-libs/glamor/glamor-0.6.0.ebuild
index f7447da..f89200c 100644
--- a/x11-libs/glamor/glamor-0.6.0.ebuild
+++ b/x11-libs/glamor/glamor-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ XORG_MODULE=driver/
 XORG_MODULE_REBUILD=yes
 S=${WORKDIR}/${PN}-egl-${PV}
 
-inherit xorg-2 autotools-utils toolchain-funcs
+inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="OpenGL based 2D rendering acceleration library"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${PN}-egl-${PV}.tar.bz2"
@@ -49,5 +49,5 @@ src_prepare() {
 
 src_install() {
# workaround parallel install failure, bug #488124.
-   autotools-utils_src_install -j1
+   xorg-2_src_install -j1
 }
-- 
2.8.1

[gentoo-dev] [PATCH 4/7] x11-proto/xcb-proto: drop autotools-utils

[Mike Gilbert]

Package-Manager: portage-2.2.28_p3
---
 x11-proto/xcb-proto/xcb-proto-1.10.ebuild   | 19 +--
 x11-proto/xcb-proto/xcb-proto-1.11.ebuild   | 19 +--
 x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild | 19 +--
 x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild | 19 +--
 4 files changed, 20 insertions(+), 56 deletions(-)

diff --git a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild 
b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
index f0ecc7a..e78ab72 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -30,19 +30,11 @@ src_configure() {
 }
 
 multilib_src_configure() {
-   autotools-utils_src_configure
+   ECONF_SOURCE="${S}"
+   econf
 
if multilib_is_native_abi; then
-   python_foreach_impl autotools-utils_src_configure
-   fi
-}
-
-multilib_src_compile() {
-   default
-
-   if multilib_is_native_abi; then
-   python_foreach_impl autotools-utils_src_compile -C xcbgen \
-   top_builddir="${BUILD_DIR}"
+   python_foreach_impl run_in_build_dir econf
fi
 }
 
@@ -58,7 +50,6 @@ multilib_src_install() {
default
 
if multilib_is_native_abi; then
-   python_foreach_impl autotools-utils_src_install -C xcbgen \
-   top_builddir="${BUILD_DIR}"
+   python_foreach_impl run_in_build_dir emake DESTDIR="${D}" 
install -C xcbgen
fi
 }
diff --git a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild 
b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
index 60a5a88..0f10a99 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -30,19 +30,11 @@ src_configure() {
 }
 
 multilib_src_configure() {
-   autotools-utils_src_configure
+   ECONF_SOURCE="${S}"
+   econf
 
if multilib_is_native_abi; then
-   python_foreach_impl autotools-utils_src_configure
-   fi
-}
-
-multilib_src_compile() {
-   default
-
-   if multilib_is_native_abi; then
-   python_foreach_impl autotools-utils_src_compile -C xcbgen \
-   top_builddir="${BUILD_DIR}"
+   python_foreach_impl run_in_build_dir econf
fi
 }
 
@@ -58,7 +50,6 @@ multilib_src_install() {
default
 
if multilib_is_native_abi; then
-   python_foreach_impl autotools-utils_src_install -C xcbgen \
-   top_builddir="${BUILD_DIR}"
+   python_foreach_impl run_in_build_dir emake DESTDIR="${D}" 
install -C xcbgen
fi
 }
diff --git a/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild 
b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
index 5239a6f..ad3a52a 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,19 +28,11 @@ src_configure() {
 }
 
 multilib_src_configure() {
-   autotools-utils_src_configure
+   ECONF_SOURCE="${S}"
+   econf
 
if multilib_is_native_abi; then
-   python_foreach_impl autotools-utils_src_configure
-   fi
-}
-
-multilib_src_compile() {
-   default
-
-   if multilib_is_native_abi; then
-   python_foreach_impl autotools-utils_src_compile -C xcbgen \
-   top_builddir="${BUILD_DIR}"
+   python_foreach_impl run_in_build_dir econf
fi
 }
 
@@ -48,8 +40,7 @@ multilib_src_install() {
default
 
if multilib_is_native_abi; then
-   python_foreach_impl autotools-utils_src_install -C xcbgen \
-   top_builddir="${BUILD_DIR}"
+   python_foreach_impl run_in_build_dir emake DESTDIR="${D}" 
install -C xcbgen
fi
 }
 
diff --git a/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild 
b/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild
index 308ca6d..9992acf 100644
--- a/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild
+++ b/x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -37,19 +37,11 @@ src_configure() {
 }
 
 multilib_src_configure() {
-   autotools-utils_src_configure
+   ECONF_SOURCE="${S}"
+   econf
 
if multilib_is_native_abi; then
-   python_foreach_impl autotools-utils_src_configure
-   fi
-}
-
-multilib_src_compile() {
- 

[gentoo-dev] [PATCH 3/7] x11-apps/intel-gpu-tools: remove reference to AUTOTOOLS_BUILD_DIR

[Mike Gilbert]

Package-Manager: portage-2.2.28_p64
---
 x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild| 16 
 x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild | 16 
 x11-apps/intel-gpu-tools/intel-gpu-tools-1.12.ebuild| 16 
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild 
b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild
index e0296a1..6092121 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -40,13 +40,13 @@ src_install() {
xorg-2_src_install
if use test-programs; then
local testprogram
-   pushd "${AUTOTOOLS_BUILD_DIR}"/tests || die
-   for testprogram in $(/dev/null || die
+   for testprogram in $(/dev/null || die
fi
 }
 
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild 
b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild
index 8251c6f..6b331c4 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -40,13 +40,13 @@ src_install() {
xorg-2_src_install
if use test-programs; then
local testprogram
-   pushd "${AUTOTOOLS_BUILD_DIR}"/tests || die
-   for testprogram in $(/dev/null || die
+   for testprogram in $(/dev/null || die
fi
 }
 
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.12.ebuild 
b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.12.ebuild
index 6ce5c35..69b9b8e 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.12.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -40,13 +40,13 @@ src_install() {
xorg-2_src_install
if use test-programs; then
local testprogram
-   pushd "${AUTOTOOLS_BUILD_DIR}"/tests || die
-   for testprogram in $(/dev/null || die
+   for testprogram in $(/dev/null || die
fi
 }
 
-- 
2.8.1

[gentoo-dev] [PATCH 2/7] x11-base/xorg-server: remove reference to AUTOTOOLS_BUILD_DIR

[Mike Gilbert]

Package-Manager: portage-2.2.28_p64
---
 x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild | 4 ++--
 x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild | 4 ++--
 x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild | 4 ++--
 x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild | 4 ++--
 x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild | 4 ++--
 x11-base/xorg-server/xorg-server-1.16.4.ebuild| 4 ++--
 x11-base/xorg-server/xorg-server-1.17.4.ebuild| 4 ++--
 x11-base/xorg-server/xorg-server-1.18.0.ebuild| 2 +-
 x11-base/xorg-server/xorg-server-1.18.1.ebuild| 2 +-
 x11-base/xorg-server/xorg-server-1.18.2.ebuild| 2 +-
 x11-base/xorg-server/xorg-server-1.18.3.ebuild| 2 +-
 11 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild 
b/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
index a8e3006..df3c50b 100644
--- a/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -192,7 +192,7 @@ src_install() {
 
if ! use minimal && use xorg; then
# Install xorg.conf.example into docs
-   dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+   dodoc hw/xfree86/xorg.conf.example
fi
 
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild 
b/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild
index eb381fc..4edb74a 100644
--- a/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -180,7 +180,7 @@ src_install() {
 
if ! use minimal && use xorg; then
# Install xorg.conf.example into docs
-   dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+   dodoc hw/xfree86/xorg.conf.example
fi
 
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
diff --git a/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild 
b/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild
index 2aefe0c..b7d4699 100644
--- a/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -203,7 +203,7 @@ src_install() {
 
if ! use minimal && use xorg; then
# Install xorg.conf.example into docs
-   dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+   dodoc hw/xfree86/xorg.conf.example
fi
 
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
diff --git a/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild 
b/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild
index b16ac10..9001060 100644
--- a/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -190,7 +190,7 @@ src_install() {
 
if ! use minimal && use xorg; then
# Install xorg.conf.example into docs
-   dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+   dodoc hw/xfree86/xorg.conf.example
fi
 
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild 
b/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild
index 3176198..dd8b490 100644
--- a/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -203,7 +203,7 @@ src_install() {
 
if ! use minimal && use xorg; then
# Install xorg.conf.example into docs
-   dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+   dodoc hw/xfree86/xorg.conf.example
fi
 
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
diff --git a/x11-base/xorg-server/xorg-server-1.16.4.ebuild 
b/x11-base/xorg-server/xorg-server-1.16.4.ebuild
index a8b2e71..d74b972 100644
--- a/x11-base/xorg-server/xorg-server-1.16.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.16.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU 

[gentoo-dev] [PATCH 0/7] Dropping autotools-utils from xorg-2

[Mike Gilbert]

The xorg-2 eclass currently uses the deprecated autotools-utils and
autotools-multilib eclasses, which are banned in EAPI 6.

This patchset attempts to remove any trace of autotools-utils from ebuilds
using xorg-2.

Note that I am touching stable ebuilds here to avoid forking an "xorg-3"
eclass. If there is a strong feeling that this is too dangerous, I can alter
my approach. I have build tested most packages using xorg-2, and only a few
had issues.

This patchset is also on github: https://github.com/gentoo/gentoo/pull/1289

Mike Gilbert (7):
  xorg-2.eclass: drop autotools-utils
  x11-base/xorg-server: remove reference to AUTOTOOLS_BUILD_DIR
  x11-apps/intel-gpu-tools: remove reference to AUTOTOOLS_BUILD_DIR
  x11-proto/xcb-proto: drop autotools-utils
  x11-apps/xauth: drop autotools-utils
  x11-libs/glamor: drop autotools-utils
  x11-libs/xpyb: set XORG_EAUTORECONF instead of AUTOTOOLS_AUTORECONF

 eclass/xorg-2.eclass   | 73 +++---
 .../intel-gpu-tools/intel-gpu-tools-1.10.ebuild| 16 ++---
 .../intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild | 16 ++---
 .../intel-gpu-tools/intel-gpu-tools-1.12.ebuild| 16 ++---
 x11-apps/xauth/xauth-1.0.9-r1.ebuild   |  7 ++-
 x11-apps/xauth/xauth-1.0.9-r2.ebuild   |  7 ++-
 x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild  |  4 +-
 x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild  |  4 +-
 x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild  |  4 +-
 x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild  |  4 +-
 x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild  |  4 +-
 x11-base/xorg-server/xorg-server-1.16.4.ebuild |  4 +-
 x11-base/xorg-server/xorg-server-1.17.4.ebuild |  4 +-
 x11-base/xorg-server/xorg-server-1.18.0.ebuild |  2 +-
 x11-base/xorg-server/xorg-server-1.18.1.ebuild |  2 +-
 x11-base/xorg-server/xorg-server-1.18.2.ebuild |  2 +-
 x11-base/xorg-server/xorg-server-1.18.3.ebuild |  2 +-
 x11-libs/glamor/glamor-0.6.0-r1.ebuild |  6 +-
 x11-libs/glamor/glamor-0.6.0.ebuild|  6 +-
 x11-libs/xpyb/xpyb-1.3.1-r2.ebuild |  4 +-
 x11-libs/xpyb/xpyb-1.3.1-r3.ebuild |  2 +-
 x11-proto/xcb-proto/xcb-proto-1.10.ebuild  | 19 ++
 x11-proto/xcb-proto/xcb-proto-1.11.ebuild  | 19 ++
 x11-proto/xcb-proto/xcb-proto-1.8-r3.ebuild| 19 ++
 x11-proto/xcb-proto/xcb-proto-1.9-r1.ebuild| 19 ++
 25 files changed, 128 insertions(+), 137 deletions(-)

-- 
2.8.1

[gentoo-dev] [PATCH 1/7] xorg-2.eclass: drop autotools-utils

[Mike Gilbert]

---
 eclass/xorg-2.eclass | 73 +++-
 1 file changed, 49 insertions(+), 24 deletions(-)

diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index 437265a..f6cf1f9 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -43,12 +43,14 @@ fi
 # before inheriting this eclass.
 : ${XORG_MULTILIB:="no"}
 
-# we need to inherit autotools first to get the deps
-inherit autotools autotools-utils eutils libtool multilib toolchain-funcs \
+# Manage AUTOTOOLS_DEPEND ourselves
+: ${AUTOTOOLS_AUTO_DEPEND:="no"}
+
+inherit autotools eutils libtool multilib toolchain-funcs \
flag-o-matic ${FONT_ECLASS} ${GIT_ECLASS}
 
 if [[ ${XORG_MULTILIB} == yes ]]; then
-   inherit autotools-multilib
+   inherit multilib-minimal
 fi
 
 EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
@@ -124,13 +126,11 @@ if [[ ${PN} != util-macros ]] ; then
# Required even by xorg-server
[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" 
>=media-fonts/font-util-1.2.0"
 fi
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
 for arch in ${XORG_EAUTORECONF_ARCHES}; do
-   EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
+   EAUTORECONF_DEPENDS+=" ${arch}? ( ${AUTOTOOLS_DEPEND} 
${EAUTORECONF_DEPEND} )"
 done
 DEPEND+=" ${EAUTORECONF_DEPENDS}"
-[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${EAUTORECONF_DEPEND}"
+[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${AUTOTOOLS_DEPEND} 
${EAUTORECONF_DEPEND}"
 unset EAUTORECONF_DEPENDS
 unset EAUTORECONF_DEPEND
 
@@ -350,6 +350,14 @@ xorg-2_patch_source() {
EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
 
[[ -d "${EPATCH_SOURCE}" ]] && epatch
+
+   if [[ "$(declare -p PATCHES 2>/dev/null)" == "declare -a"* ]]; then
+   epatch "${PATCHES[@]}"
+   elif [[ -n ${PATCHES} ]]; then
+   epatch ${PATCHES}
+   fi
+
+   epatch_user
 }
 
 # @FUNCTION: xorg-2_reconf_source
@@ -358,18 +366,15 @@ xorg-2_patch_source() {
 xorg-2_reconf_source() {
debug-print-function ${FUNCNAME} "$@"
 
+   [[ -e configure.ac || -e configure.in ]] || return 0
+
+   local run_ea=${XORG_EAUTORECONF}
+
case ${CHOST} in
-   *-interix* | *-aix* | *-winnt*)
-   # some hosts need full eautoreconf
-   [[ -e "./configure.ac" || -e "./configure.in" ]] \
-   && AUTOTOOLS_AUTORECONF=1
-   ;;
-   *)
-   # elibtoolize required for BSD
-   [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" 
|| -e "./configure.in" ) ]] \
-   && AUTOTOOLS_AUTORECONF=1
-   ;;
+   *-interix* | *-aix* | *-winnt*) run_ea=yes ;;
esac
+
+   [[ ${run_ea} == no ]] || eautoreconf
 }
 
 # @FUNCTION: xorg-2_src_prepare
@@ -380,7 +385,6 @@ xorg-2_src_prepare() {
 
xorg-2_patch_source
xorg-2_reconf_source
-   autotools-utils_src_prepare "$@"
 }
 
 # @FUNCTION: xorg-2_font_configure
@@ -472,12 +476,18 @@ xorg-2_src_configure() {
${dep_track}
${FONT_OPTIONS}
"${xorgconfadd[@]}"
+   "$@"
)
 
if [[ ${XORG_MULTILIB} == yes ]]; then
-   autotools-multilib_src_configure "$@"
+   if ! declare -f multilib_src_configure >/dev/null; then
+   multilib_src_configure() {
+   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+   }
+   fi
+   multilib-minimal_src_configure
else
-   autotools-utils_src_configure "$@"
+   econf "${myeconfargs[@]}"
fi
 }
 
@@ -487,10 +497,17 @@ xorg-2_src_configure() {
 xorg-2_src_compile() {
debug-print-function ${FUNCNAME} "$@"
 
+   local makeargs=( "$@" )
+
if [[ ${XORG_MULTILIB} == yes ]]; then
-   autotools-multilib_src_compile "$@"
+   if ! declare -f multilib_src_compile >/dev/null; then
+   multilib_src_compile() {
+   emake "${makeargs[@]}"
+   }
+   fi
+   multilib-minimal_src_compile
else
-   autotools-utils_src_compile "$@"
+   emake "${makeargs[@]}"
fi
 }
 
@@ -509,10 +526,18 @@ xorg-2_src_install() {
)
fi
 
+   install_args+=( "$@" )
+
if [[ ${XORG_MULTILIB} == yes ]]; then
-   autotools-multilib_src_install "${install_args[@]}"
+   if ! declare -f multilib_src_install >/dev/null; then
+   multilib_src_install() {
+   emake DESTDIR="${D}" install 
"${install_args[@]}"
+   }
+   fi
+   multilib-minimal_src_install
else
-   

Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: eclass/

[Anthony G. Basile]

On 4/17/16 4:15 AM, Fabian Groffen wrote:
> On 16-04-2016 21:05:56 +0200, Michał Górny wrote:
>> Congratulations! You've just committed an invalid dependency that is
>> going to cause true mayhem on every package using the eclass.
> 
> I assume you've taken proper actions to mitigate this.
> 
>> But why would anyone send patches for review, or even start wondering
>> that we might be using USE=libressl all around for some reason...
> 
> While I believe your point is right (patches for review), I think this
> style of communication is unnecessary.

In case you haven't been following the other communications regarding
the matter, the USE flag is not necessary here because ssl-cert.eclass
does not involve any linking against openssl/libressl.  So I'll be
recommitting the original patch without the slot operator.

The original patch is at

https://gitweb.gentoo.org/repo/gentoo.git/commit/eclass/ssl-cert.eclass?id=7a4d6bd5fcb25d8381bc08e20ad6a5c1c80ad78f

plus s/:0=/:0/

> 
> Thanks,
> Fabian
> 


-- 
Anthony G. Basile, Ph.D.
Gentoo Linux Developer [Hardened]
E-Mail: bluen...@gentoo.org
GnuPG FP  : 1FED FAD9 D82C 52A5 3BAB  DC79 9384 FA6E F52D 4BBA
GnuPG ID  : F52D4BBA

[gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: eclass/

[Fabian Groffen]

On 16-04-2016 21:05:56 +0200, Michał Górny wrote:
> Congratulations! You've just committed an invalid dependency that is
> going to cause true mayhem on every package using the eclass.

I assume you've taken proper actions to mitigate this.

> But why would anyone send patches for review, or even start wondering
> that we might be using USE=libressl all around for some reason...

While I believe your point is right (patches for review), I think this
style of communication is unnecessary.

Thanks,
Fabian

-- 
Fabian Groffen
Gentoo on a different level


signature.asc
Description: Digital signature

[gentoo-portage-dev] [PATCH 3/4] repoman: Use XML Schema for metadata.xml validation

[Michał Górny]

---
 pym/repoman/_xml.py  | 16 +-
 pym/repoman/metadata.py  | 39 
 pym/repoman/modules/scan/metadata/__init__.py|  2 +-
 pym/repoman/modules/scan/metadata/pkgmetadata.py |  6 ++--
 pym/repoman/scanner.py   |  8 ++---
 5 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py
index d55dda5..33a536a 100644
--- a/pym/repoman/_xml.py
+++ b/pym/repoman/_xml.py
@@ -12,7 +12,7 @@ from portage import os
 from portage.output import red
 from portage.process import find_binary
 
-from repoman.metadata import fetch_metadata_dtd
+from repoman.metadata import fetch_metadata_xsd
 from repoman._subprocess import repoman_getstatusoutput
 
 
@@ -53,12 +53,12 @@ class 
_MetadataTreeBuilder(xml.etree.ElementTree.TreeBuilder):
 
 class XmlLint(object):
 
-   def __init__(self, options, repoman_settings, metadata_dtd=None):
-   self.metadata_dtd = (metadata_dtd or
-   os.path.join(repoman_settings["DISTDIR"], 
'metadata.dtd'))
+   def __init__(self, options, repoman_settings, metadata_xsd=None):
+   self.metadata_xsd = (metadata_xsd or
+   os.path.join(repoman_settings["DISTDIR"], 
'metadata.xsd'))
self.options = options
self.repoman_settings = repoman_settings
-   self._is_capable = metadata_dtd is not None
+   self._is_capable = metadata_xsd is not None
self.binary = None
self._check_capable()
 
@@ -69,7 +69,7 @@ class XmlLint(object):
if not self.binary:
print(red("!!! xmllint not found. Can't check 
metadata.xml.\n"))
elif not self._is_capable:
-   if not fetch_metadata_dtd(self.metadata_dtd, 
self.repoman_settings):
+   if not fetch_metadata_xsd(self.metadata_xsd, 
self.repoman_settings):
sys.exit(1)
# this can be problematic if xmllint changes their 
output
self._is_capable = True
@@ -93,8 +93,8 @@ class XmlLint(object):
# xmlint can produce garbage output even on success, so only 
dump
# the ouput when it fails.
st, out = repoman_getstatusoutput(
-   self.binary + " --nonet --noout --dtdvalid %s %s" % (
-   portage._shell_quote(self.metadata_dtd),
+   self.binary + " --nonet --noout --schema %s %s" % (
+   portage._shell_quote(self.metadata_xsd),
portage._shell_quote(
os.path.join(checkdir, 
"metadata.xml"
if st != os.EX_OK:
diff --git a/pym/repoman/metadata.py b/pym/repoman/metadata.py
index e95ad41..7a514dc 100644
--- a/pym/repoman/metadata.py
+++ b/pym/repoman/metadata.py
@@ -33,8 +33,9 @@ metadata_xml_declaration = '' \
% (metadata_xml_encoding,)
 metadata_doctype_name = 'pkgmetadata'
 metadata_dtd_uri = 'http://www.gentoo.org/dtd/metadata.dtd'
+metadata_xsd_uri = 'http://www.gentoo.org/xml-schema/metadata.xsd'
 # force refetch if the local copy creation time is older than this
-metadata_dtd_ctime_interval = 60 * 60 * 24 * 7  # 7 days
+metadata_xsd_ctime_interval = 60 * 60 * 24 * 7  # 7 days
 
 
 def parse_metadata_use(xml_tree):
@@ -86,36 +87,36 @@ def parse_metadata_use(xml_tree):
return uselist
 
 
-def fetch_metadata_dtd(metadata_dtd, repoman_settings):
+def fetch_metadata_xsd(metadata_xsd, repoman_settings):
"""
-   Fetch metadata.dtd if it doesn't exist or the ctime is older than
-   metadata_dtd_ctime_interval.
+   Fetch metadata.xsd if it doesn't exist or the ctime is older than
+   metadata_xsd_ctime_interval.
@rtype: bool
@return: True if successful, otherwise False
"""
 
must_fetch = True
-   metadata_dtd_st = None
+   metadata_xsd_st = None
current_time = int(time.time())
try:
-   metadata_dtd_st = os.stat(metadata_dtd)
+   metadata_xsd_st = os.stat(metadata_xsd)
except EnvironmentError as e:
if e.errno not in (errno.ENOENT, errno.ESTALE):
raise
del e
else:
-   # Trigger fetch if metadata.dtd mtime is old or clock is wrong.
-   if abs(current_time - metadata_dtd_st.st_ctime) \
-   < metadata_dtd_ctime_interval:
+   # Trigger fetch if metadata.xsd mtime is old or clock is wrong.
+   if abs(current_time - metadata_xsd_st.st_ctime) \
+   < metadata_xsd_ctime_interval:
must_fetch = False
 
if must_fetch:
print()
print(
-   "%s the 

[gentoo-portage-dev] [PATCH 4/4] tests: Include metadata.xsd for repoman tests

[Michał Górny]

---
 .travis.yml  |   4 +-
 MANIFEST.in  |   2 +-
 cnf/metadata.dtd | 102 --
 cnf/metadata.xsd | 547 +++
 pym/portage/tests/repoman/test_simple.py |   8 +-
 5 files changed, 554 insertions(+), 109 deletions(-)
 delete mode 100644 cnf/metadata.dtd
 create mode 100644 cnf/metadata.xsd

diff --git a/.travis.yml b/.travis.yml
index b662d94..5213fee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ python:
 script:
 - ./setup.py test
 - ./setup.py install --root=/tmp/install-root
-# prevent repoman tests from trying to fetch metadata.dtd
+# prevent repoman tests from trying to fetch metadata.xsd
 - mkdir -p /tmp/install-root/usr/lib/portage/cnf
-- cp cnf/metadata.dtd /tmp/install-root/usr/lib/portage/cnf/
+- cp cnf/metadata.xsd /tmp/install-root/usr/lib/portage/cnf/
 - sudo rsync -a /tmp/install-root/. /
 - python -b -Wd -m portage.tests.runTests
diff --git a/MANIFEST.in b/MANIFEST.in
index d65c874..2178460 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -12,7 +12,7 @@ include cnf/make.conf.example.*
 
 # extra files for tests
 include .portage_not_installed
-include cnf/metadata.dtd
+include cnf/metadata.xsd
 
 # extra scripts
 include misc/*
diff --git a/cnf/metadata.dtd b/cnf/metadata.dtd
deleted file mode 100644
index ff2649c..000
--- a/cnf/metadata.dtd
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-  
-  
-
-  
-  
-
-  
-  
-
-  
-  
-
-  
-  
-  
-
-
-  
-
-  
-
-  
-
-  
-  
-
-  
-
-
-  
-  
-
-  
-  
-
-  
-  
-
-
-
-
-  
-
-
-
-
-  
-
-  
-  
-  
-  
-
-
-
-  
-  
-  
-
-
-  
-  
-  
-  
-
-
-
-
-
-
-
diff --git a/cnf/metadata.xsd b/cnf/metadata.xsd
new file mode 100644
index 000..0ead09e
--- /dev/null
+++ b/cnf/metadata.xsd
@@ -0,0 +1,547 @@
+
+
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+ 

[gentoo-portage-dev] [PATCH 1/4] tests: Stop using herds

[Michał Górny]

---
 pym/portage/tests/emerge/test_simple.py  |  2 --
 pym/portage/tests/repoman/test_simple.py |  3 ---
 pym/portage/tests/resolver/ResolverPlayground.py | 22 --
 3 files changed, 27 deletions(-)

diff --git a/pym/portage/tests/emerge/test_simple.py 
b/pym/portage/tests/emerge/test_simple.py
index 394ed43..e5ecd4b 100644
--- a/pym/portage/tests/emerge/test_simple.py
+++ b/pym/portage/tests/emerge/test_simple.py
@@ -153,14 +153,12 @@ pkg_preinst() {
(
"dev-libs/A",
{
-   "herd" : "base-system",
"flags" : "Description of how USE='flag' affects this package",
},
),
(
"dev-libs/B",
{
-   "herd" : "no-herd",
"flags" : "Description of how USE='flag' affects this package",
},
),
diff --git a/pym/portage/tests/repoman/test_simple.py 
b/pym/portage/tests/repoman/test_simple.py
index 98220c4..720560b 100644
--- a/pym/portage/tests/repoman/test_simple.py
+++ b/pym/portage/tests/repoman/test_simple.py
@@ -133,21 +133,18 @@ class SimpleRepomanTestCase(TestCase):
(
"dev-libs/A",
{
-   "herd" : "base-system",
"flags" : "Description of how USE='flag' affects this 
package",
},
),
(
"dev-libs/B",
{
-   "herd" : "no-herd",
"flags" : "Description of how USE='flag' affects this package",
},
),
(
"dev-libs/C",
{
-   "herd" : "no-herd",
"flags" : "Description of how USE='flag' affects this package",
},
),
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py 
b/pym/portage/tests/resolver/ResolverPlayground.py
index 6bdf2c7..68e047a 100644
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -47,7 +47,6 @@ class ResolverPlayground(object):
metadata_xml_template = """
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-%(herd)s
 
 maintainer-nee...@gentoo.org
 Description of the maintainership
@@ -381,27 +380,6 @@ class ResolverPlayground(object):
#Create profile symlink
os.symlink(sub_profile_dir, 
os.path.join(user_config_dir, "make.profile"))
 
-   #Create minimal herds.xml
-   herds_xml = """
-http://www.gentoo.org/dtd/herds.dtd;>
-
-
-
-
-  base-system
-  base-sys...@gentoo.org
-  Core system utilities and libraries.
-  
-base-sys...@gentoo.orgg
-Base System
-Base System Maintainer
-  
-
-
-"""
-   with open(os.path.join(metadata_dir, 
"metadata.xml"), 'w') as f:
-   f.write(herds_xml)
-
make_conf = {
"ACCEPT_KEYWORDS": "x86",
"CLEAN_DELAY": "0",
-- 
2.8.1

[gentoo-portage-dev] [PATCH 2/4] tests: Add type="" to

[Michał Górny]

---
 pym/portage/tests/resolver/ResolverPlayground.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/portage/tests/resolver/ResolverPlayground.py 
b/pym/portage/tests/resolver/ResolverPlayground.py
index 68e047a..d1434f7 100644
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -47,7 +47,7 @@ class ResolverPlayground(object):
metadata_xml_template = """
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
+
 maintainer-nee...@gentoo.org
 Description of the maintainership
 
-- 
2.8.1

[gentoo-portage-dev] [PATCH 0/4] GLEP 67 + XML Schema, rebased against repoman

[Michał Górny]

Same as before, rebased on top of repoman branch. Tested on git-mirror
checkout (with metadata/xml-schema dir) and local git checkout
(fetching from www). Travis also seems happy.

Michał Górny (4):
  tests: Stop using herds
  tests: Add type="" to 
  repoman: Use XML Schema for metadata.xml validation
  tests: Include metadata.xsd for repoman tests

 .travis.yml  |   4 +-
 MANIFEST.in  |   2 +-
 cnf/metadata.dtd | 102 -
 cnf/metadata.xsd | 547 +++
 pym/portage/tests/emerge/test_simple.py  |   2 -
 pym/portage/tests/repoman/test_simple.py |  11 +-
 pym/portage/tests/resolver/ResolverPlayground.py |  24 +-
 pym/repoman/_xml.py  |  16 +-
 pym/repoman/metadata.py  |  39 +-
 pym/repoman/modules/scan/metadata/__init__.py|   2 +-
 pym/repoman/modules/scan/metadata/pkgmetadata.py |   6 +-
 pym/repoman/scanner.py   |   8 +-
 12 files changed, 591 insertions(+), 172 deletions(-)
 delete mode 100644 cnf/metadata.dtd
 create mode 100644 cnf/metadata.xsd

-- 
2.8.1