[gentoo-commits] repo/gentoo:master commit in: app-misc/bb/files/, app-misc/bb/

2015-08-22 Thread Sergei Trofimovich
commit: 2ebcf571537f84030611472713e5d08f0524f6ba
Author: Sergei Trofimovich slyfox AT gentoo DOT org
AuthorDate: Sat Aug 22 08:45:45 2015 +
Commit: Sergei Trofimovich slyfox AT gentoo DOT org
CommitDate: Sat Aug 22 08:49:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ebcf571

app-misc/bb: disable broken pulseaudio plugin, bug #516964 by James L. Hammons

Package-Manager: portage-2.2.20

 app-misc/bb/bb-1.3.0_rc1-r4.ebuild | 66 ++
 app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch | 23 
 app-misc/bb/files/bb-1.3.0_rc1-protos.patch| 16 ++
 3 files changed, 105 insertions(+)

diff --git a/app-misc/bb/bb-1.3.0_rc1-r4.ebuild 
b/app-misc/bb/bb-1.3.0_rc1-r4.ebuild
new file mode 100644
index 000..8dc6338
--- /dev/null
+++ b/app-misc/bb/bb-1.3.0_rc1-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils versionator
+
+MY_P=${PN}-$(get_version_component_range 1-2)$(get_version_component_range 
4-4)
+
+DESCRIPTION=Demonstration program for visual effects of aalib
+HOMEPAGE=http://aa-project.sourceforge.net/;
+SRC_URI=mirror://sourceforge/aa-project/${MY_P}.tar.gz
+
+LICENSE=GPL-2
+SLOT=0
+KEYWORDS=~amd64 ~x86
+IUSE=mikmod
+
+DEPEND=media-libs/aalib:=
+   dev-libs/lzo:=
+   mikmod? ( media-libs/libmikmod:= )
+
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+
+src_prepare() {
+   epatch ${FILESDIR}/${P}-noattr.patch
+   epatch ${FILESDIR}/${P}-fix-protos.patch
+   epatch ${FILESDIR}/${P}-messager-overlap.patch
+   epatch ${FILESDIR}/${P}-zbuff-fault.patch
+   epatch ${FILESDIR}/${P}-printf-cleanup.patch
+   epatch ${FILESDIR}/${P}-m4-stuff.patch
+   epatch ${FILESDIR}/${P}-protos.patch
+   epatch ${FILESDIR}/${P}-disable-pulse.patch
+
+   # unbundle lzo, #515286
+   rm -v README.LZO minilzo.{c,h} mylzo.h || die
+   sed -e 's/minilzo.c//' \
+   -e 's/minilzo.h//' \
+   -e 's/README.LZO//' \
+   -i Makefile.am || die
+   echo 'bb_LDADD = -llzo2'  Makefile.am || die
+   # update code
+   sed -e 's,#include minilzo.h,#include lzo/lzo1x.h,' \
+   -e 's,int size = image,lzo_uint size = image,' \
+   -i image.c || die
+
+   # rename binary and manpage bb - bb-aalib
+
+   mv bb.1 bb-aalib.1 || die
+   sed -e 's/bb/bb-aalib/' \
+   -i bb-aalib.1
+   sed -e 's/bin_PROGRAMS = bb/bin_PROGRAMS = bb-aalib/' \
+   -e 's/man_MANS = bb.1/man_MANS = bb-aalib.1/' \
+   -e 's/bb_SOURCES/bb_aalib_SOURCES/'   \
+   -e 's/bb_LDADD/bb_aalib_LDADD/'   \
+   -i Makefile.am || die
+
+   AT_M4DIR=m4 eautoreconf
+}
+
+pkg_postinst() {
+   elog bb binary has been renamed to bb-aalib to avoid a naming conflict 
with sys-apps/busybox.
+}

diff --git a/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch 
b/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch
new file mode 100644
index 000..dcc00c6
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-disable-pulse.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/516964
+diff --git a/main.c b/main.c
+index c0648b4..a9fac57 100644
+--- a/main.c
 b/main.c
+@@ -160,6 +160,17 @@ main (int argc, char *argv[])
+   aa_flush (context);
+   if (tolower (aa_getkey (context, 1)) != 'n')
+ {
++  /* Unfortunately recently added native pulseaudio
++   * driver in libmikmod does not allow you to
++   * call 'MikMod_Update' in a non-blocking way.
++   *
++   * It's a known limitation of simple pulseaudio API
++   * thus we derevisted pulseaudio driver to fallback
++   * on alsa, oss or whatever used to work for user.
++   */
++  drv_pulseaudio.Name= NULL;
++  drv_pulseaudio.Version = NULL;
++
+   MikMod_RegisterAllDrivers ();
+   MikMod_RegisterLoader (load_s3m);
+   /*md_mode |= DMODE_SOFT_MUSIC; */

diff --git a/app-misc/bb/files/bb-1.3.0_rc1-protos.patch 
b/app-misc/bb/files/bb-1.3.0_rc1-protos.patch
new file mode 100644
index 000..aa3fc02
--- /dev/null
+++ b/app-misc/bb/files/bb-1.3.0_rc1-protos.patch
@@ -0,0 +1,16 @@
+diff --git a/bb.c b/bb.c
+index 95850ef..a394d00 100644
+--- a/bb.c
 b/bb.c
+@@ -27,2 +27,3 @@
+ #include aalib.h
++#include time.h
+ #include bb.h
+diff --git a/main.c b/main.c
+index 417ff62..c0648b4 100644
+--- a/main.c
 b/main.c
+@@ -23,2 +23,3 @@
+ 
++#include ctype.h
+ #include string.h



[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/

2015-08-22 Thread Alexis Ballier
commit: 7572631c02d9cd344896f44e5d3999cc5c58668d
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 09:16:58 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 09:16:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7572631c

media-video/gpac-: update to use github instead of sf.net

Package-Manager: portage-2.2.20.1

 ...gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch | 15 
 .../gpac/files/gpac-0.5.2-static-libs.patch| 85 ++
 media-video/gpac/gpac-.ebuild  | 16 ++--
 3 files changed, 109 insertions(+), 7 deletions(-)

diff --git 
a/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch 
b/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
new file mode 100644
index 000..df3a5fc
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
@@ -0,0 +1,15 @@
+Export gf_isom_set_pixel_aspect_ratio.
+media-video/x264-encoder needs it and this funcion used to be exported.
+
+diff --git a/src/isomedia/isom_write.c b/src/isomedia/isom_write.c
+index e935acc..9841d85 100644
+--- a/src/isomedia/isom_write.c
 b/src/isomedia/isom_write.c
+@@ -1270,6 +1270,7 @@ GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 
trackNumber, u32 StreamDes
+   }
+ }
+ 
++GF_EXPORT
+ GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 
StreamDescriptionIndex, u32 hSpacing, u32 vSpacing)
+ {
+   GF_Err e;

diff --git a/media-video/gpac/files/gpac-0.5.2-static-libs.patch 
b/media-video/gpac/files/gpac-0.5.2-static-libs.patch
new file mode 100644
index 000..ec11eae
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.5.2-static-libs.patch
@@ -0,0 +1,85 @@
+diff --git a/Makefile b/Makefile
+index 62b7850..ff4b589 100644
+--- a/Makefile
 b/Makefile
+@@ -219,7 +219,9 @@ ifeq ($(GPAC_ENST), yes)
+   $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h 
$(DESTDIR)$(prefix)/include/gpac/enst
+ endif
+   mkdir -p $(DESTDIR)$(prefix)/$(libdir)
++ifeq ($(STATICLIBS),yes)
+   $(INSTALL) $(INSTFLAGS) -m 644 ./bin/gcc/libgpac_static.a 
$(DESTDIR)$(prefix)/$(libdir)
++endif
+   $(MAKE) installdylib
+ 
+ uninstall-lib:
+diff --git a/configure b/configure
+index df00dff..561bcd3 100755
+--- a/configure
 b/configure
+@@ -101,6 +101,7 @@ has_xmlrpc=no
+ has_openjpeg=no
+ gprof_build=no
+ static_build=no
++static_libs=no
+ want_pic=no
+ want_gcov=no
+ has_joystick=no
+@@ -252,6 +253,7 @@ GPAC configuration options:
+   --enable-amr-wb  enable AMR WB library
+   --enable-amr enable both AMR NB and WB libraries
+   --enable-static-bin  link statically against libgpac
++  --enable-static-lib  GPAC static libraries build
+   --static-mp4box  configure for static linking of MP4Box only.
+   --enable-depth   enables depth handling in the compositor
+ 
+@@ -1849,6 +1851,8 @@ for opt do
+ ;;
+ --enable-static-bin) static_build=yes;
+ ;;
++--enable-static-lib) static_libs=yes;
++;;
+ --disable-ipv6) has_ipv6=no
+ ;;
+ --disable-wx) has_wx=no
+@@ -2525,6 +2529,7 @@ echo ** GPAC $version rev$revision Core Configuration 
**
+ echo debug version: $debuginfo
+ echo GProf enabled: $gprof_build
+ echo Static build enabled: $static_build
++echo Static libs build enabled: $static_libs
+ echo Memory tracking enabled: $use_memory_tracking
+ echo Fixed-Point Version: $use_fixed_point
+ echo IPV6 Support: $has_ipv6
+@@ -3133,6 +3138,7 @@ echo DEBUGBUILD=$debuginfo  config.mak
+ echo GPROFBUILD=$gprof_build  config.mak
+ echo MP4BOX_STATIC=$static_mp4box  config.mak
+ echo STATICBUILD=$static_build  config.mak
++echo STATICLIBS=$static_libs  config.mak
+ 
+ echo CONFIG_IPV6=$has_ipv6  config.mak
+ if test $has_ipv6 = yes ; then
+diff --git a/src/Makefile b/src/Makefile
+index ba9d9ab..89ea67f 100644
+--- a/src/Makefile
 b/src/Makefile
+@@ -610,17 +610,20 @@ compositor: $(LIBGPAC_COMPOSITOR)
+   @echo LIBS $(EXTRALIBS)
+ 
+ ifeq ($(CONFIG_DARWIN),yes)
+-
++ifeq ($(STATICLIBS),yes)
+   $(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
+   $(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+ ifneq ($(STATICBUILD),yes)
+   $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) 
+ endif
+ 
+ else
+ 
++ifeq ($(STATICLIBS),yes)
+   $(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
+   $(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+ ifneq ($(STATICBUILD),yes)
+   $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) 
+   mv $@ $@.$(VERSION_SONAME)

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index d2209c4..ab5603b 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -5,12 +5,13 @@
 EAPI=4
 
 if [[ ${PV} == * ]] ; then
-   

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/

2015-08-22 Thread Alexis Ballier
commit: 4e6cd1f8a40eb2ba48f346901fb92834b0a1de8e
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 09:27:41 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 09:27:41 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e6cd1f8

media-video/gpac: fix ebuild.minorsyn

Package-Manager: portage-2.2.20.1

 media-video/gpac/gpac-0.5.2.ebuild | 1 -
 media-video/gpac/gpac-.ebuild  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/media-video/gpac/gpac-0.5.2.ebuild 
b/media-video/gpac/gpac-0.5.2.ebuild
index 19d06af..14c43be 100644
--- a/media-video/gpac/gpac-0.5.2.ebuild
+++ b/media-video/gpac/gpac-0.5.2.ebuild
@@ -22,7 +22,6 @@ LICENSE=GPL-2
 SLOT=0
 IUSE=a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png 
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid
 
-
 RDEPEND=
a52? ( media-libs/a52dec )
aac? ( =media-libs/faad2-2.0 )

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index 2c15ff5..fb000a1 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -22,7 +22,6 @@ LICENSE=GPL-2
 SLOT=0
 IUSE=a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k mad opengl oss png 
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid
 
-
 RDEPEND=
a52? ( media-libs/a52dec )
aac? ( =media-libs/faad2-2.0 )



[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/files/, media-video/gpac/

2015-08-22 Thread Alexis Ballier
commit: c6e6f0001f670de9b9fc20d2b17fa051ed725b0a
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 09:26:43 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 09:26:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e6f000

media-video/gpac: bump to 0.5.2

Package-Manager: portage-2.2.20.1

 media-video/gpac/Manifest  |   1 +
 .../gpac/files/gpac-0.5.2-static-libs.patch|  80 ++
 media-video/gpac/gpac-0.5.2.ebuild | 116 +
 3 files changed, 197 insertions(+)

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index f16d0af..dd66f6e 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,2 +1,3 @@
 DIST gpac-0.5.0.tar.gz 7861057 SHA256 
42971ac39511a1b6d1db39af664ce887b38c8657328c88cd200d87a02de81c24 SHA512 
dee7701c791c441c1f050d9591d4e4dd7bdd2908f535233b114959c9a0adc256b3d5e40f5c84fd0f8b1c6764bfe6b35ec0af6bfd1fb056d593aeedca75105278
 WHIRLPOOL 
1797afa09864a1e9632c121dc2076963ec5e73395abdcd76896d23dc675e03847a42d733ae9fc3bb29bd26b7b336ea0f49e6e8e79c87a0bd0458cd429a7bf271
 DIST gpac-0.5.1_pre5456.tar.xz 5938432 SHA256 
81746ad1d9a8ae0a84c73652d1af5d86d9c36229b278422c13e353893893a83c SHA512 
25883e32d83dc2b4649c506b86f745d2f8e75fff629b534205979aeb519a167243e62ec0d78e453d1edc27435acffd521a8c08a739cde05196f61e93ac47
 WHIRLPOOL 
af5a89cb52802bc45edd29c6f0f5ce9f48decea16eef8a76c33c7161a6d48b3d43f1a2b4c3049d2f1f92d0c3f22b787a33c1652f42d2c0cf3b84ad58c2fb7589
+DIST gpac-0.5.2.tar.gz 9044537 SHA256 
14de020482fc0452240f368564baa95a71b729980e4f36d94dd75c43ac4d9d5c SHA512 
b682895c6615a2a57845190c246681f4d83a73e1f96f200fed6bfe97b7273ab5d30618b7782cd442e68e8c9e37971792dfd6366dcf21b3b3bdbb1a8bc979
 WHIRLPOOL 
d3e45dd7eb7070aca8d9bbc55d235f31a2955b682f1f0ae145b14db8dda69397fb840beadd7c0631bee0560f6bb3bad23a0abbc9571bab4df323136dd1c1c122

diff --git a/media-video/gpac/files/gpac-0.5.2-static-libs.patch 
b/media-video/gpac/files/gpac-0.5.2-static-libs.patch
new file mode 100644
index 000..91c89c4
--- /dev/null
+++ b/media-video/gpac/files/gpac-0.5.2-static-libs.patch
@@ -0,0 +1,80 @@
+Index: gpac-0.5.2/configure
+===
+--- gpac-0.5.2.orig/configure
 gpac-0.5.2/configure
+@@ -101,6 +101,7 @@ has_xmlrpc=no
+ has_openjpeg=no
+ gprof_build=no
+ static_build=no
++static_libs=no
+ want_pic=no
+ want_gcov=no
+ has_joystick=no
+@@ -248,6 +249,7 @@ GPAC configuration options:
+   --enable-amr-wb  enable AMR WB library
+   --enable-amr enable both AMR NB and WB libraries
+   --enable-static-bin  GPAC static build
++  --enable-static-lib  GPAC static libraries build
+   --static-mp4box  configure for static linking of MP4Box.
+   --enable-depth   enables depth handling in the compositor
+ 
+@@ -1775,6 +1777,8 @@ for opt do
+ ;;
+ --enable-static-bin) static_build=yes;
+ ;;
++  --enable-static-lib) static_libs=yes;
++ ;;
+ --disable-ipv6) has_ipv6=no
+ ;;
+ --disable-wx) has_wx=no
+@@ -2452,6 +2456,7 @@ echo ** GPAC $version rev$revision Core
+ echo debug version: $debuginfo
+ echo GProf enabled: $gprof_build
+ echo Static build enabled: $static_build
++echo Static libs build enabled: $static_libs
+ echo Memory tracking enabled: $use_memory_tracking
+ echo Use standard memory allocator: $use_std_alloc
+ echo Fixed-Point Version: $use_fixed_point
+@@ -3064,6 +3069,7 @@ echo CONFIG_AMR_WB_FT=$has_amr_wb  c
+ echo DEBUGBUILD=$debuginfo  config.mak
+ echo GPROFBUILD=$gprof_build  config.mak
+ echo STATICBUILD=$static_build  config.mak
++echo STATICLIBS=$static_libs  config.mak
+ 
+ echo CONFIG_IPV6=$has_ipv6  config.mak
+ if test $has_ipv6 = yes ; then
+Index: gpac-0.5.2/Makefile
+===
+--- gpac-0.5.2.orig/Makefile
 gpac-0.5.2/Makefile
+@@ -203,7 +203,9 @@ ifeq ($(GPAC_ENST), yes)
+   $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h 
$(DESTDIR)$(prefix)/include/gpac/enst
+ endif
+   mkdir -p $(DESTDIR)$(prefix)/$(libdir)
++ifeq ($(STATICLIBS),yes)
+   $(INSTALL) $(INSTFLAGS) -m 644 ./bin/gcc/libgpac_static.a 
$(DESTDIR)$(prefix)/$(libdir)
++endif
+   $(MAKE) installdylib
+ 
+ uninstall-lib:
+Index: gpac-0.5.2/src/Makefile
+===
+--- gpac-0.5.2.orig/src/Makefile
 gpac-0.5.2/src/Makefile
+@@ -606,12 +606,16 @@ compositor: $(LIBGPAC_COMPOSITOR)
+   @echo OBJS $(OBJS)
+   @echo LIBS $(EXTRALIBS)
+ ifeq ($(CONFIG_DARWIN),yes)
++ifeq ($(STATICLIBS),yes)
+   $(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
+   $(RANLIB) ../bin/gcc/libgpac_static.a
++endif
+   $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) 
+ else
++ifeq 

[gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/files/, media-video/x264-encoder/

2015-08-22 Thread Alexis Ballier
commit: 4817c4335f9229f7334016f34e0dac966ed66419
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 09:29:38 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 09:29:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4817c433

media-video/x264-encoder: Fix gpac / mp4 support.

https://bugs.gentoo.org/show_bug.cgi?id=499116

Package-Manager: portage-2.2.20.1

 media-video/x264-encoder/files/gpac.patch   | 13 +
 ...oder-.ebuild = x264-encoder-0.0.20150820-r1.ebuild} |  8 ++--
 media-video/x264-encoder/x264-encoder-.ebuild   |  8 ++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/media-video/x264-encoder/files/gpac.patch 
b/media-video/x264-encoder/files/gpac.patch
new file mode 100644
index 000..94da64c
--- /dev/null
+++ b/media-video/x264-encoder/files/gpac.patch
@@ -0,0 +1,13 @@
+Index: x264-snapshot-20150820-2245/configure
+===
+--- x264-snapshot-20150820-2245.orig/configure
 x264-snapshot-20150820-2245/configure
+@@ -1086,7 +1086,7 @@ fi
+ 
+ if [ $gpac = auto -a $lsmash != yes ] ; then
+ gpac=no
+-GPAC_LIBS=-lgpac_static
++GPAC_LIBS=-lgpac
+ cc_check  -lz  GPAC_LIBS=$GPAC_LIBS -lz
+ if [ $SYS = WINDOWS ] ; then
+ cc_check  -lws2_32  GPAC_LIBS=$GPAC_LIBS -lws2_32

diff --git a/media-video/x264-encoder/x264-encoder-.ebuild 
b/media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild
similarity index 93%
copy from media-video/x264-encoder/x264-encoder-.ebuild
copy to media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild
index 64e7ddc..71259d7 100644
--- a/media-video/x264-encoder/x264-encoder-.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic multilib toolchain-funcs eutils
 
 DESCRIPTION=A free commandline encoder for X264/AVC streams
 HOMEPAGE=http://www.videolan.org/developers/x264.html;
@@ -29,7 +29,7 @@ REQUIRED_USE=ffmpegsource? ( ffmpeg )
 RDEPEND=ffmpeg? ( virtual/ffmpeg )
~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
ffmpegsource? ( media-libs/ffmpegsource )
-   mp4? ( =media-video/gpac-0.4.1_pre20060122 )
+   mp4? ( =media-video/gpac-0.5.2 )
 
 ASM_DEP==dev-lang/yasm-1.2.0
 DEPEND=${RDEPEND}
@@ -38,6 +38,10 @@ DEPEND=${RDEPEND}
x86-fbsd? ( ${ASM_DEP} )
virtual/pkgconfig
 
+src_prepare() {
+   epatch ${FILESDIR}/gpac.patch
+}
+
 src_configure() {
tc-export CC
 

diff --git a/media-video/x264-encoder/x264-encoder-.ebuild 
b/media-video/x264-encoder/x264-encoder-.ebuild
index 64e7ddc..71259d7 100644
--- a/media-video/x264-encoder/x264-encoder-.ebuild
+++ b/media-video/x264-encoder/x264-encoder-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic multilib toolchain-funcs eutils
 
 DESCRIPTION=A free commandline encoder for X264/AVC streams
 HOMEPAGE=http://www.videolan.org/developers/x264.html;
@@ -29,7 +29,7 @@ REQUIRED_USE=ffmpegsource? ( ffmpeg )
 RDEPEND=ffmpeg? ( virtual/ffmpeg )
~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
ffmpegsource? ( media-libs/ffmpegsource )
-   mp4? ( =media-video/gpac-0.4.1_pre20060122 )
+   mp4? ( =media-video/gpac-0.5.2 )
 
 ASM_DEP==dev-lang/yasm-1.2.0
 DEPEND=${RDEPEND}
@@ -38,6 +38,10 @@ DEPEND=${RDEPEND}
x86-fbsd? ( ${ASM_DEP} )
virtual/pkgconfig
 
+src_prepare() {
+   epatch ${FILESDIR}/gpac.patch
+}
+
 src_configure() {
tc-export CC
 



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/ia64/

2015-08-22 Thread Alexis Ballier
commit: 40bec56be585bb814e5ba4681481d7ad10f77f3c
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 10:04:17 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 10:04:17 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40bec56b

profiles/arch/ia64/use.mask: Mask librtmp for renaming the flag in ffmpeg, part 
of bug #509974

 profiles/arch/ia64/use.mask | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index c598e2f..8386d29 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -84,6 +84,7 @@ schroedinger
 ots
 eclipse
 vaapi
+librtmp
 rtmp
 vpx
 frei0r



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/sparc/

2015-08-22 Thread Alexis Ballier
commit: 0955d8ba298543fc181bda35d8db492985bb3139
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 10:01:58 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 10:01:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0955d8ba

profiles/arch/sparc/use.mask: Mask librtmp for renaming the flag in ffmpeg, 
part of bug #509974

 profiles/arch/sparc/use.mask | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index 0c5bf8d..17330a0 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -118,6 +118,7 @@ lensfun
 jingle
 mod_wsgi
 vaapi
+librtmp
 rtmp
 vpx
 kde



[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

2015-08-22 Thread Alexis Ballier
commit: efc4511fa5660df7fd4384cea31bfbccbfc7a90e
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 10:05:56 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 10:05:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efc4511f

media-video/ffmpeg: rename rtmp useflag to librtmp, bug #509974

Package-Manager: portage-2.2.20.1

 media-video/ffmpeg/ffmpeg-2.6.3.ebuild | 6 +++---
 media-video/ffmpeg/ffmpeg-2.6.4.ebuild | 6 +++---
 media-video/ffmpeg/ffmpeg-2.7.2.ebuild | 6 +++---
 media-video/ffmpeg/ffmpeg-.ebuild  | 6 +++---
 media-video/ffmpeg/metadata.xml| 2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild 
b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
index 2f513ba..cc84933 100644
--- a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
# decoders
amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme 
gsm:libgsm
-   modplug:libmodplug opus:libopus quvi:libquvi rtmp:librtmp 
ssh:libssh
+   modplug:libmodplug opus:libopus quvi:libquvi librtmp ssh:libssh
schroedinger:libschroedinger speex:libspeex vorbis:libvorbis 
vpx:libvpx
zvbi:libzvbi
# libavfilter options
@@ -207,7 +207,7 @@ RDEPEND=
opus? ( =media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
pulseaudio? ( =media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
-   rtmp? ( =media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+   librtmp? ( =media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
samba? ( =net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
schroedinger? ( =media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] 
)
sdl? ( =media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
@@ -243,7 +243,7 @@ DEPEND=${RDEPEND}
ladspa? ( =media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
libv4l? ( =virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
cpu_flags_x86_mmx? ( =dev-lang/yasm-1.2 )
-   rtmp? ( =virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+   librtmp? ( =virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
schroedinger? ( =virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
test? ( net-misc/wget sys-devel/bc )
truetype? ( =virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

diff --git a/media-video/ffmpeg/ffmpeg-2.6.4.ebuild 
b/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
index f4e269c..b9a6919 100644
--- a/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
# decoders
amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme 
gsm:libgsm
-   modplug:libmodplug opus:libopus quvi:libquvi rtmp:librtmp 
ssh:libssh
+   modplug:libmodplug opus:libopus quvi:libquvi librtmp ssh:libssh
schroedinger:libschroedinger speex:libspeex vorbis:libvorbis 
vpx:libvpx
zvbi:libzvbi
# libavfilter options
@@ -207,7 +207,7 @@ RDEPEND=
opus? ( =media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
pulseaudio? ( =media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
-   rtmp? ( =media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+   librtmp? ( =media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
samba? ( =net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
schroedinger? ( =media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] 
)
sdl? ( =media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
@@ -243,7 +243,7 @@ DEPEND=${RDEPEND}
ladspa? ( =media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
libv4l? ( =virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
cpu_flags_x86_mmx? ( =dev-lang/yasm-1.2 )
-   rtmp? ( =virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+   librtmp? ( =virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
schroedinger? ( =virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
test? ( net-misc/wget sys-devel/bc )
truetype? ( =virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )

diff --git a/media-video/ffmpeg/ffmpeg-2.7.2.ebuild 
b/media-video/ffmpeg/ffmpeg-2.7.2.ebuild
index c568a8f..83094e5 100644
--- a/media-video/ffmpeg/ffmpeg-2.7.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.7.2.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
# decoders
amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme 
gsm:libgsm
-   modplug:libmodplug 

[gentoo-commits] repo/gentoo:master commit in: profiles/arch/alpha/

2015-08-22 Thread Alexis Ballier
commit: 2f18b8a9a7cf6438c2bc33bed8e5ddeb249a4e45
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 10:03:52 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 10:03:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f18b8a9

profiles/arch/alpha/use.mask: Mask librtmp for renaming the flag in ffmpeg, 
part of bug #509974

 profiles/arch/alpha/use.mask | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index 1485291..342d979 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -60,6 +60,7 @@ pike
 timidity
 valgrind
 vaapi
+librtmp
 rtmp
 vpx
 kde



[gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm/

2015-08-22 Thread Alexis Ballier
commit: fa55f24d01e6ed77d2b52c3d3c626735698744a6
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 10:04:54 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 10:04:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa55f24d

profiles/arch/arm/use.mask: Mask librtmp for renaming the flag in ffmpeg, part 
of bug #509974

 profiles/arch/arm/use.mask | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index 538b24a..199b1ec 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -126,6 +126,7 @@ xanim
 fits
 tokyocabinet
 vaapi
+librtmp
 rtmp
 vpx
 iplayer



[gentoo-commits] repo/gentoo:master commit in: games-strategy/freeciv/

2015-08-22 Thread Lars Wendler
commit: b964bb05fe54c61122e225a623d6349f11c7363b
Author: Lars Wendler polynomial-c AT gentoo DOT org
AuthorDate: Sat Aug 22 08:55:31 2015 +
Commit: Lars Wendler polynomial-c AT gentoo DOT org
CommitDate: Sat Aug 22 08:55:59 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b964bb05

games-strategy/freeciv: Bump to version 2.5.1

with kind permission from mr_bones_

Package-Manager: portage-2.2.20.1
Signed-off-by: Lars Wendler polynomial-c AT gentoo.org

 games-strategy/freeciv/Manifest |   1 +
 games-strategy/freeciv/freeciv-2.5.1.ebuild | 178 
 2 files changed, 179 insertions(+)

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index e10ca61..0260544 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,2 +1,3 @@
 DIST freeciv-2.4.4.tar.bz2 38847925 SHA256 
8307fc9d69571b031ccc465e8029d8a7ea3dbef4e3651f2de07356aba931e2a3 SHA512 
3f2ff619b21c36748a98bda98c923ec9ea71faf18cac77d8b247e4a79c4a8f41c9b399e648a0a51fe54738de3276081c31ded98f769104812125d304716796a7
 WHIRLPOOL 
0eb8374ad2d7174dab8971c39c0ce7f14e72c1c7a64dfa8461a054a53d2b659af71197bad7c65e65e3e5da4fd5552bfb10aa2fa8b9870c9b1fbd7e03c58c9c00
 DIST freeciv-2.5.0.tar.bz2 40323793 SHA256 
bd9f7523ea79b8d2806d0c1844a9f48506ccd18276330580319913c43051210b SHA512 
f03bafdca47da0677ad81ed945afe79bbd01ae871b95e6bdaf6249acb8420e78e3210dd60f520d960ec127e1d443f45c11fcc484b49b6bb59cab5904e51fc651
 WHIRLPOOL 
1a9768837b40c6c19ff6138d07074d96d75d2cecdb671180659d9380beb7c996fcb0be2fb343166fe46e92cc2c2e7495be2683f62440540cea3072f34e928391
+DIST freeciv-2.5.1.tar.bz2 40686265 SHA256 
4e420a9ad91aa7966039ec3b63501725c8261a4ff734d56fe801414fae772696 SHA512 
c0f5df3df7bab9ad8e9e7ce75ea90a539ca7e6aafb0af2b57a3d30b095e30f3b093e66bd8b92524e0e19919e0f5d4b822946219bf270e6071102db56290119b8
 WHIRLPOOL 
1773d56801316afae6ab470b1b1fdf71b42bd42ff0f7ede62b28c5ef7abcd0af36887401937a028b4a9a2e19f994389ef5f63c0395545ebcb367ff2089e2fd55

diff --git a/games-strategy/freeciv/freeciv-2.5.1.ebuild 
b/games-strategy/freeciv/freeciv-2.5.1.ebuild
new file mode 100644
index 000..1b4d6aa
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.5.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION=multiplayer strategy game (Civilization Clone)
+HOMEPAGE=http://www.freeciv.org/;
+SRC_URI=mirror://sourceforge/freeciv/${P}.tar.bz2
+
+LICENSE=GPL-2
+SLOT=0
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+IUSE=auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline 
sdl +server +sound sqlite system-lua
+
+# postgres isn't yet really supported by upstream
+RDEPEND=app-arch/bzip2
+   app-arch/xz-utils
+   net-misc/curl
+   sys-libs/zlib
+   auth? (
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
+   )
+   readline? ( sys-libs/readline:0 )
+   dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
+   !dedicated? (
+   media-libs/libpng:0
+   gtk? ( x11-libs/gtk+:2 )
+   mapimg? ( media-gfx/imagemagick )
+   modpack? ( x11-libs/gtk+:2 )
+   nls? ( virtual/libintl )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   sdl? (
+   media-libs/libsdl[video]
+   media-libs/sdl-gfx
+   media-libs/sdl-image[png]
+   media-libs/sdl-ttf
+   )
+   server? ( aimodules? ( sys-devel/libtool:2 ) )
+   sound? (
+   media-libs/libsdl[sound]
+   media-libs/sdl-mixer[vorbis]
+   )
+   !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
+   )
+   system-lua? ( =dev-lang/lua-5.2 )
+DEPEND=${RDEPEND}
+   virtual/pkgconfig
+   !dedicated? (
+   x11-proto/xextproto
+   nls? ( sys-devel/gettext )
+   )
+
+pkg_setup() {
+   if use !dedicated  use !server ; then
+   ewarn Disabling server USE flag will make it impossible
+   ewarn to start local games, but you will still be able to
+   ewarn join multiplayer games.
+   fi
+   games_pkg_setup
+}
+
+src_prepare() {
+
+   # install the .desktop in /usr/share/applications
+   # install the icons in /usr/share/pixmaps
+   sed -i \
+   -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
+   -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+   -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+   client/Makefile.in \
+   

[gentoo-commits] repo/gentoo:master commit in: media-video/gpac/, media-video/gpac/files/

2015-08-22 Thread Alexis Ballier
commit: 2d3805f9c45c2803e5b6b78b4210e409384785fb
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 09:20:14 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 09:20:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d3805f9

media-video/gpac-: minor updates.

Rename patch to ...-0.5.3-... as it does not apply to 0.5.2.
Do not override S for releases.

Package-Manager: portage-2.2.20.1

 .../{gpac-0.5.2-static-libs.patch = gpac-0.5.3-static-libs.patch} | 0
 media-video/gpac/gpac-.ebuild  | 3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-video/gpac/files/gpac-0.5.2-static-libs.patch 
b/media-video/gpac/files/gpac-0.5.3-static-libs.patch
similarity index 100%
rename from media-video/gpac/files/gpac-0.5.2-static-libs.patch
rename to media-video/gpac/files/gpac-0.5.3-static-libs.patch

diff --git a/media-video/gpac/gpac-.ebuild 
b/media-video/gpac/gpac-.ebuild
index ab5603b..2c15ff5 100644
--- a/media-video/gpac/gpac-.ebuild
+++ b/media-video/gpac/gpac-.ebuild
@@ -11,7 +11,6 @@ if [[ ${PV} == * ]] ; then
 else
SRC_URI=https://github.com/gpac/gpac/archive/v${PV}.tar.gz - 
${P}.tar.gz
KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-   S=${WORKDIR}/${PN}
 fi
 
 inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
@@ -65,7 +64,7 @@ my_use() {
 
 src_prepare() {
epatch  ${FILESDIR}/110_all_implicitdecls.patch \
-   ${FILESDIR}/${PN}-0.5.2-static-libs.patch \
+   ${FILESDIR}/${PN}-0.5.3-static-libs.patch \

${FILESDIR}/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
sed -i -e s:\(--disable-.*\)=\*):\1): configure || die
 }



[gentoo-commits] proj/qt:master commit in: www-client/qupzilla/files/, www-client/qupzilla/

2015-08-22 Thread Ben de Groot
commit: a92f17152735d22bf67656fb25c27f7bde2422c7
Author: Ben de Groot yngwin AT gentoo DOT org
AuthorDate: Sat Aug 22 09:21:48 2015 +
Commit: Ben de Groot yngwin AT gentoo DOT org
CommitDate: Sat Aug 22 09:21:48 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a92f1715

www-client/qupzilla: update live ebuild for Qt5

I have made the necessary updates, but upstream switched the master branch
(version 1.9.x) to use QtWebEngine, for which we have no ebuild yet.

Bug: 554380
Bug: 531284

Package-Manager: portage-2.2.20.1

 www-client/qupzilla/Manifest   |  1 +
 .../files/qtsingleapplication-QDataStream.patch| 10 +++
 www-client/qupzilla/qupzilla-.ebuild   | 97 +++---
 3 files changed, 76 insertions(+), 32 deletions(-)

diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
new file mode 100644
index 000..d4ede65
--- /dev/null
+++ b/www-client/qupzilla/Manifest
@@ -0,0 +1 @@
+DIST qupzilla-plugins-2015.06.05.tar.gz 335627 SHA256 
afc9589e54c3ed49f58c727c3ff7bd59d4467dfaf2ff78f57cd98afc4dfc1f7b SHA512 
5f2a4b1796431c62580e569b57445b2a309b2314f59ceb0c99da2a1703a2ee23bd2d1cac8a1532be5f2161976b4dd5f439c08abe5c1826115e9adf636fc12522
 WHIRLPOOL 
10b53426888dc8868de783403463d0bbf83ee59fdf74f2409b78a725b4f90d08aa9698e622d3acfdedbca469397b2e3d4ed8f06d3112bd9cff6e76527b1611eb

diff --git a/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch 
b/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch
new file mode 100644
index 000..25694af
--- /dev/null
+++ b/www-client/qupzilla/files/qtsingleapplication-QDataStream.patch
@@ -0,0 +1,10 @@
+--- src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp.ORIG  2015-05-07 
18:29:35.045402873 +0200
 src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp   2015-05-07 
18:33:04.942404927 +0200
+@@ -39,6 +39,7 @@
+ /
+
+
++#include QDataStream
+ #include qtlocalpeer.h
+ #include QCoreApplication
+ #include QTime

diff --git a/www-client/qupzilla/qupzilla-.ebuild 
b/www-client/qupzilla/qupzilla-.ebuild
index 69fa35d..a78b64d 100644
--- a/www-client/qupzilla/qupzilla-.ebuild
+++ b/www-client/qupzilla/qupzilla-.ebuild
@@ -3,71 +3,104 @@
 # $Id$
 
 EAPI=5
+MY_PN=QupZilla
+MY_P=${MY_PN}-${PV}
 
-if [[ ${PV} ==  ]]; then
-   VCS_ECLASS=git-2
-   EGIT_REPO_URI=git://github.com/QupZilla/${PN}.git
-   KEYWORDS=
+if [[ ${PV} == ** ]]; then
+   VCS_ECLASS=git-r3
+   EGIT_BRANCH=master
+   EGIT_REPO_URI=git://github.com/${MY_PN}/${PN}.git
 else
VCS_ECLASS=vcs-snapshot
-   MY_P=QupZilla-${PV}
-   SRC_URI=mirror://github/QupZilla/${PN}/${MY_P}.tar.gz
-   KEYWORDS=~amd64 ~x86
+   
SRC_URI=https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.xz;
+   KEYWORDS=~amd64 ~arm ~x86
S=${WORKDIR}/${MY_P}
 fi
 
-PLOCALES=ar_SA bg_BG ca_ES cs_CZ de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR 
fi_FI fr_FR gl_ES he_IL hu_HU id_ID it_IT ja_JP ka_GE lg lv_LV nl_NL nqo pl_PL 
pt_BR pt_PT ro_RO ru_RU sk_SK sr@ijekavianlatin sr@ijekavian sr@latin sr sv_SE 
tr_TR uk_UA uz@Latn zh_CN zh_TW
+PLOCALES=ar_SA bg_BG ca_ES cs_CZ de_DE el_GR es_ES es_MX es_VE eu_ES fa_IR 
fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID it_IT ja_JP ka_GE lg lv_LV nl_NL nqo 
pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr sr@ijekavian sr@ijekavianlatin sr@latin 
sv_SE tr_TR uk_UA uz@Latn zh_CN zh_TW
+PLUGINS_HASH='7c66cb2efbd18eacbd04ba211162b1a042e5b759'
+PLUGINS_VERSION='2015.06.05' # if there are no updates, we can use the older 
archive
 
-inherit l10n multilib qt4-r2 ${VCS_ECLASS}
+inherit eutils l10n multilib qmake-utils ${VCS_ECLASS}
 
 DESCRIPTION=Qt WebKit web browser
 HOMEPAGE=http://www.qupzilla.com/;
+SRC_URI+=https://github.com/${MY_PN}/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz
 - ${PN}-plugins-${PLUGINS_VERSION}.tar.gz
 
 LICENSE=GPL-3
 SLOT=0
-IUSE=dbus debug kde nonblockdialogs
+IUSE=dbus debug gnome-keyring nonblockdialogs
 
-DEPEND=
-   =dev-qt/qtcore-4.7:4
-   =dev-qt/qtgui-4.7:4
-   =dev-qt/qtscript-4.7:4
-   =dev-qt/qtsql-4.7:4
-   =dev-qt/qtwebkit-4.7:4
-   dbus? ( =dev-qt/qtdbus-4.7:4 )
-RDEPEND=${DEPEND}
+RDEPEND=dev-libs/openssl:0
+   x11-libs/libX11
+   gnome-keyring? ( gnome-base/gnome-keyring )
+   =dev-qt/qtcore-5.5:5
+   =dev-qt/qtgui-5.5:5
+   =dev-qt/qtconcurrent-5.5:5
+   =dev-qt/qtprintsupport-5.5:5
+   =dev-qt/qtscript-5.5:5
+   =dev-qt/qtsql-5.5:5[sqlite]
+   =dev-qt/qtwebengine-5.5:5[widgets]
+   dbus? ( =dev-qt/qtdbus-5.5:5 )
+DEPEND=${RDEPEND}
+   virtual/pkgconfig
+   =dev-qt/linguist-tools-5.5:5
 
 DOCS=( AUTHORS BUILDING CHANGELOG FAQ README.md )
 
+src_unpack() {
+   if [[ ${PV} == ** ]]; then
+   git-r3_src_unpack
+   unpack ${A}
+   else
+   default
+   fi
+}
+
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-libs/urdfdom/

2015-08-22 Thread Alexis Ballier
commit: 833c98eb4c433c4cfc7d3665179a5bd20eb2373f
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 09:33:43 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 09:33:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=833c98eb

dev-libs/urdfdom: Add missing dep on dev-libs/tinyxml.

https://bugs.gentoo.org/show_bug.cgi?id=558404

Package-Manager: portage-2.2.20.1

 dev-libs/urdfdom/urdfdom-0.3.0.ebuild | 1 +
 dev-libs/urdfdom/urdfdom-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-libs/urdfdom/urdfdom-0.3.0.ebuild 
b/dev-libs/urdfdom/urdfdom-0.3.0.ebuild
index e231308..763b5ca 100644
--- a/dev-libs/urdfdom/urdfdom-0.3.0.ebuild
+++ b/dev-libs/urdfdom/urdfdom-0.3.0.ebuild
@@ -30,6 +30,7 @@ IUSE=
 
 RDEPEND=dev-libs/urdfdom_headers
dev-libs/console_bridge
+   dev-libs/tinyxml
dev-libs/boost:=[threads]
 DEPEND=${RDEPEND}
 

diff --git a/dev-libs/urdfdom/urdfdom-.ebuild 
b/dev-libs/urdfdom/urdfdom-.ebuild
index e231308..763b5ca 100644
--- a/dev-libs/urdfdom/urdfdom-.ebuild
+++ b/dev-libs/urdfdom/urdfdom-.ebuild
@@ -30,6 +30,7 @@ IUSE=
 
 RDEPEND=dev-libs/urdfdom_headers
dev-libs/console_bridge
+   dev-libs/tinyxml
dev-libs/boost:=[threads]
 DEPEND=${RDEPEND}
 



[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

2015-08-22 Thread Alexis Ballier
commit: d18d89cdd674b7eb62619f8cc4b583e358ee7a43
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 09:53:37 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 09:53:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d18d89cd

media-video/ffmpeg: Check for -mcpu, then -march and finally -mtune for 
determining cpu type.

Should fix https://bugs.gentoo.org/show_bug.cgi?id=553632

Package-Manager: portage-2.2.20.1

 media-video/ffmpeg/ffmpeg-2.6.3.ebuild | 2 +-
 media-video/ffmpeg/ffmpeg-2.6.4.ebuild | 2 +-
 media-video/ffmpeg/ffmpeg-2.7.2.ebuild | 2 +-
 media-video/ffmpeg/ffmpeg-.ebuild  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild 
b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
index fb7c820..2f513ba 100644
--- a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
@@ -364,7 +364,7 @@ multilib_src_configure() {
# We need to do this so that features of that CPU will be better used
# If they contain an unknown CPU it will not hurt since ffmpeg's 
configure
# will just ignore it.
-   for i in $(get-flag mcpu) $(get-flag mtune) $(get-flag march) ; do
+   for i in $(get-flag mcpu) $(get-flag march) $(get-flag mtune) ; do
[[ ${i} = native ]]  i=host # bug #273421
myconf+=( --cpu=${i} )
break

diff --git a/media-video/ffmpeg/ffmpeg-2.6.4.ebuild 
b/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
index c970d54..f4e269c 100644
--- a/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
@@ -364,7 +364,7 @@ multilib_src_configure() {
# We need to do this so that features of that CPU will be better used
# If they contain an unknown CPU it will not hurt since ffmpeg's 
configure
# will just ignore it.
-   for i in $(get-flag mcpu) $(get-flag mtune) $(get-flag march) ; do
+   for i in $(get-flag mcpu) $(get-flag march) $(get-flag mtune) ; do
[[ ${i} = native ]]  i=host # bug #273421
myconf+=( --cpu=${i} )
break

diff --git a/media-video/ffmpeg/ffmpeg-2.7.2.ebuild 
b/media-video/ffmpeg/ffmpeg-2.7.2.ebuild
index 280e101..c568a8f 100644
--- a/media-video/ffmpeg/ffmpeg-2.7.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.7.2.ebuild
@@ -364,7 +364,7 @@ multilib_src_configure() {
# We need to do this so that features of that CPU will be better used
# If they contain an unknown CPU it will not hurt since ffmpeg's 
configure
# will just ignore it.
-   for i in $(get-flag mcpu) $(get-flag mtune) $(get-flag march) ; do
+   for i in $(get-flag mcpu) $(get-flag march) $(get-flag mtune) ; do
[[ ${i} = native ]]  i=host # bug #273421
myconf+=( --cpu=${i} )
break

diff --git a/media-video/ffmpeg/ffmpeg-.ebuild 
b/media-video/ffmpeg/ffmpeg-.ebuild
index ca8ee9f..fa8dea8 100644
--- a/media-video/ffmpeg/ffmpeg-.ebuild
+++ b/media-video/ffmpeg/ffmpeg-.ebuild
@@ -366,7 +366,7 @@ multilib_src_configure() {
# We need to do this so that features of that CPU will be better used
# If they contain an unknown CPU it will not hurt since ffmpeg's 
configure
# will just ignore it.
-   for i in $(get-flag mcpu) $(get-flag mtune) $(get-flag march) ; do
+   for i in $(get-flag mcpu) $(get-flag march) $(get-flag mtune) ; do
[[ ${i} = native ]]  i=host # bug #273421
myconf+=( --cpu=${i} )
break



[gentoo-commits] repo/gentoo:master commit in: media-sound/helm/

2015-08-22 Thread Ben de Groot
commit: 81beda2f81ae01b6a18b331838608cfe77f0df60
Author: Ben de Groot yngwin AT gentoo DOT org
AuthorDate: Sat Aug 22 10:24:21 2015 +
Commit: Ben de Groot yngwin AT gentoo DOT org
CommitDate: Sat Aug 22 10:24:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81beda2f

media-sound/helm: initial commit

Package-Manager: portage-2.2.20.1

 media-sound/helm/Manifest  |  1 +
 media-sound/helm/helm-0.4.1.ebuild | 33 +
 media-sound/helm/metadata.xml  |  5 +
 3 files changed, 39 insertions(+)

diff --git a/media-sound/helm/Manifest b/media-sound/helm/Manifest
new file mode 100644
index 000..7090407
--- /dev/null
+++ b/media-sound/helm/Manifest
@@ -0,0 +1 @@
+DIST helm-0.4.1.tar.gz 10170154 SHA256 
00fa6b973b3e13d574a19dc009e07cbbcb7823476ffc59cc89e6816b7a70bd72 SHA512 
093abfd47a7f3e25d168df675b8a9c067a361ae1891af208c75ec4bc02d8a30cc5de4ab2433179bcbb6074c142c8ef9b4ef11b1854fdde0551fcd340dd6b8fe0
 WHIRLPOOL 
6d7297b2e064d24252d11b415225e081cb2033230aba013e774198b66e6ca89196691ed8db61d9baa02e7cc09497af61462f36244668a8b3469828388f3c5d49

diff --git a/media-sound/helm/helm-0.4.1.ebuild 
b/media-sound/helm/helm-0.4.1.ebuild
new file mode 100644
index 000..8a0e4dd
--- /dev/null
+++ b/media-sound/helm/helm-0.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION=Open source polyphonic software synthesizer with lots of 
modulation
+HOMEPAGE=http://tytel.org/helm/;
+SRC_URI=https://github.com/mtytel/helm/archive/v${PV}.tar.gz - ${P}.tar.gz
+
+LICENSE=GPL-3+
+SLOT=0
+KEYWORDS=~amd64
+IUSE=
+
+RDEPEND=media-libs/alsa-lib
+   media-libs/lv2
+   virtual/opengl
+   x11-libs/libX11
+   x11-libs/libXext
+DEPEND=${RDEPEND}
+
+DOCS=README.md
+
+src_prepare() {
+   sed -e 's|/usr/lib/|/usr/'$(get_libdir)'/|' -i Makefile || die
+   epatch_user
+}
+
+src_compile() {
+   emake PREFIX=/usr all
+}

diff --git a/media-sound/helm/metadata.xml b/media-sound/helm/metadata.xml
new file mode 100644
index 000..af0275e
--- /dev/null
+++ b/media-sound/helm/metadata.xml
@@ -0,0 +1,5 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
+pkgmetadata
+  herdproaudio/herd
+/pkgmetadata



[gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/

2015-08-22 Thread Jeroen Roovers
commit: f75e0ac45c3b1556e5937d47ce3bc1f1b5257c4a
Author: Jeroen Roovers jer AT gentoo DOT org
AuthorDate: Sat Aug 22 10:38:13 2015 +
Commit: Jeroen Roovers jer AT gentoo DOT org
CommitDate: Sat Aug 22 10:38:13 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f75e0ac4

net-ftp/lftp: Add USE=ipv6

Package-Manager: portage-2.2.20.1

 net-ftp/lftp/lftp-4.6.4.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-ftp/lftp/lftp-4.6.4.ebuild b/net-ftp/lftp/lftp-4.6.4.ebuild
index dd2804f..c02e6dc 100644
--- a/net-ftp/lftp/lftp-4.6.4.ebuild
+++ b/net-ftp/lftp/lftp-4.6.4.ebuild
@@ -13,7 +13,7 @@ LICENSE=GPL-3
 SLOT=0
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x86-solaris
 
-IUSE=convert-mozilla-cookies +gnutls idn nls openssl socks5 +ssl verify-file
+IUSE=convert-mozilla-cookies +gnutls idn ipv6 nls openssl socks5 +ssl 
verify-file
 LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
 IUSE+= ${LFTP_LINGUAS[@]/#/linguas_}
 
@@ -73,6 +73,7 @@ src_configure() {
$(use_enable nls) \
$(use_with gnutls) \
$(use_with idn libidn) \
+   $(use_enable ipv6) \
$(use_with openssl openssl ${EPREFIX}/usr) \
$(use_with socks5 socksdante ${EPREFIX}/usr) \
--enable-packager-mode \



[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

2015-08-22 Thread Amadeusz Żołnowski
commit: 21c7314e27862f8e565422b4ade62d13fd689e42
Author: Amadeusz Żołnowski aidecoe AT gentoo DOT org
AuthorDate: Sat Aug 22 11:35:46 2015 +
Commit: Amadeusz Żołnowski aidecoe AT gentoo DOT org
CommitDate: Sat Aug 22 11:35:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c7314e

net-mail/notmuch: Add sub-slot 4

Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y
is meant to be binary backward compatible.

Nothing depends directly on libnotmuch.so therefore I skip revision
bump.

Package-Manager: portage-2.2.20.1

 net-mail/notmuch/notmuch-0.20.2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-mail/notmuch/notmuch-0.20.2.ebuild 
b/net-mail/notmuch/notmuch-0.20.2.ebuild
index af45fa8..3c6b77c 100644
--- a/net-mail/notmuch/notmuch-0.20.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.20.2.ebuild
@@ -15,7 +15,9 @@ HOMEPAGE=http://notmuchmail.org/;
 SRC_URI=${HOMEPAGE%/}/releases/${P}.tar.gz
 
 LICENSE=GPL-3
-SLOT=0
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT=0/4
 KEYWORDS=~amd64 ~x86
 REQUIRED_USE=
nmbug? ( python )



[gentoo-commits] repo/gentoo:master commit in: media-sound/helm/

2015-08-22 Thread Ben de Groot
commit: 191258354b859dd1b85f06dacd7f46ac81355bca
Author: Ben de Groot yngwin AT gentoo DOT org
AuthorDate: Sat Aug 22 11:39:58 2015 +
Commit: Ben de Groot yngwin AT gentoo DOT org
CommitDate: Sat Aug 22 11:39:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19125835

media-sound/helm: add missing jack dependency

Bug: 558412

Package-Manager: portage-2.2.20.1

 media-sound/helm/helm-0.4.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/helm/helm-0.4.1.ebuild 
b/media-sound/helm/helm-0.4.1.ebuild
index 8a0e4dd..396b133 100644
--- a/media-sound/helm/helm-0.4.1.ebuild
+++ b/media-sound/helm/helm-0.4.1.ebuild
@@ -16,6 +16,7 @@ IUSE=
 
 RDEPEND=media-libs/alsa-lib
media-libs/lv2
+   media-sound/jack-audio-connection-kit
virtual/opengl
x11-libs/libX11
x11-libs/libXext



[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

2015-08-22 Thread Nicolas Bock
commit: fb553cb1f000d9246eb154719c8028f06af08a3c
Author: Nicolas Bock nicolasbock AT gentoo DOT org
AuthorDate: Sat Aug 22 11:53:35 2015 +
Commit: Nicolas Bock nicolasbock AT gentoo DOT org
CommitDate: Sat Aug 22 11:54:33 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb553cb1

app-admin/testdisk: Fix incorrect slot-operators.

This addresses Bug 555058. I would like to thank the reporter
josef.95 AT freenet.de for noticing this problem and providing a first 
patch,
and kensington AT gentoo.org for taking the time to address slot operators 
and
their correct use in great detail.

Package-Manager: portage-2.2.20.1

 app-admin/testdisk/testdisk-6.14-r2.ebuild | 83 ++
 app-admin/testdisk/testdisk-7.0-r3.ebuild  | 82 +
 2 files changed, 165 insertions(+)

diff --git a/app-admin/testdisk/testdisk-6.14-r2.ebuild 
b/app-admin/testdisk/testdisk-6.14-r2.ebuild
new file mode 100644
index 000..067ea20
--- /dev/null
+++ b/app-admin/testdisk/testdisk-6.14-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils flag-o-matic
+
+DESCRIPTION=Checks and undeletes partitions + PhotoRec, signature based 
recovery tool
+HOMEPAGE=http://www.cgsecurity.org/wiki/TestDisk;
+SRC_URI=http://www.cgsecurity.org/${P}.tar.bz2;
+
+LICENSE=GPL-2
+SLOT=0
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+IUSE=ewf jpeg ntfs reiserfs static qt4
+
+REQUIRED_USE=static? ( !qt4 )
+
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+DEPEND=
+   static? (
+   sys-apps/util-linux[static-libs]
+   =sys-libs/ncurses-5.2[static-libs]
+   jpeg? ( virtual/jpeg:0[static-libs] )
+   ntfs? ( sys-fs/ntfs3g[static-libs] )
+   reiserfs? ( 
=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
+   =sys-fs/e2fsprogs-1.35[static-libs]
+   sys-libs/zlib[static-libs]
+   !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) )
+   )
+   !static? (
+   sys-apps/util-linux
+   =sys-libs/ncurses-5.2
+   jpeg? ( virtual/jpeg:0 )
+   ntfs? ( sys-fs/ntfs3g )
+   reiserfs? ( =sys-fs/progsreiserfs-0.3.1_rc8 )
+   =sys-fs/e2fsprogs-1.35
+   sys-libs/zlib
+   !arm? ( ewf? ( app-forensics/libewf:= ) )
+   qt4? ( dev-qt/qtgui:4 )
+   )
+RDEPEND=!static? ( ${DEPEND} )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=( )
+PATCHES=( ${FILESDIR}/fix_rare_crash-6.14.patch )
+
+src_configure() {
+   local myconf
+
+   # this is static method is the same used by upstream for their 'static' 
make
+   # target, but better, as it doesn't break.
+   use static  append-ldflags -static
+
+   # --with-foo are broken, any use of --with/--without disable the
+   # functionality.
+   # The following variation must be used.
+   use reiserfs || myconf+= --without-reiserfs
+   use ntfs || myconf+= --without-ntfs --without-ntfs3g
+   use jpeg || myconf+= --without-jpeg
+   use ewf || myconf+= --without-ewf
+   myconf+=$(usex qt4  --enable-qt  --disable-qt)
+
+   econf \
+   --docdir ${ROOT}/usr/share/doc/${P} \
+   --enable-sudo \
+   ${myconf}
+
+   # perform safety checks for NTFS, REISERFS and JPEG
+   if use ntfs  ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' 
${S}/config.h ; then
+   die Failed to find either NTFS or NTFS-3G library.
+   fi
+   if use reiserfs  egrep -q 'undef HAVE_LIBREISERFS\' ${S}/config.h 
; then
+   die Failed to find reiserfs library.
+   fi
+   if use jpeg  egrep -q 'undef HAVE_LIBJPEG\' ${S}/config.h ; then
+   die Failed to find jpeg library.
+   fi
+}

diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild 
b/app-admin/testdisk/testdisk-7.0-r3.ebuild
new file mode 100644
index 000..b70f9bf
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.0-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils flag-o-matic
+
+DESCRIPTION=Checks and undeletes partitions + PhotoRec, signature based 
recovery tool
+HOMEPAGE=http://www.cgsecurity.org/wiki/TestDisk;
+SRC_URI=http://www.cgsecurity.org/${P}.tar.bz2;
+
+LICENSE=GPL-2
+SLOT=0
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+IUSE=ewf jpeg ntfs reiserfs static qt4
+
+REQUIRED_USE=static? ( !qt4 )
+
+# WARNING: reiserfs support does 

[gentoo-commits] sites/www:master commit in: _data/, _plugins/, /

2015-08-22 Thread Alex Legler
commit: 3b98f18405f8ac93844bd1344264f586d2e3dc9e
Author: Alex Legler alex AT a3li DOT li
AuthorDate: Sat Aug 22 12:05:53 2015 +
Commit: Alex Legler a3li AT gentoo DOT org
CommitDate: Sat Aug 22 12:05:53 2015 +
URL:https://gitweb.gentoo.org/sites/www.git/commit/?id=3b98f184

Adapt to news changes

 .gitmodules  |  2 +-
 _data/news   |  2 +-
 _plugins/news.rb | 16 +++-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 79663bc..f67095d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule _data/news]
path = _data/news
-   url = git://anongit.gentoo.org/proj/gentoo-news.git
+   url = git://anongit.gentoo.org/data/gentoo-news.git

diff --git a/_data/news b/_data/news
index 9ab5b27..a50b763 16
--- a/_data/news
+++ b/_data/news
@@ -1 +1 @@
-Subproject commit 9ab5b274a5f6632910f38c3255484d604568ea3f
+Subproject commit a50b763c338161b4621d23e9fa5cd6e11455d6ca

diff --git a/_plugins/news.rb b/_plugins/news.rb
index e65b08d..a93aa06 100644
--- a/_plugins/news.rb
+++ b/_plugins/news.rb
@@ -6,15 +6,13 @@ module Gentoo
   site.data['newsitems'] ||= []
 
   Dir.chdir(NEWS_DIR) do
-Dir.glob('[0-9][0-9][0-9][0-9]').reverse.each do |year|
-  Dir.glob(#{year}/[0-9][0-9][0-9][0-9]*).reverse.each do |path|
-begin
-  name = path.gsub(/#{year}\//, '')
-
-  site.pages  NewsPage.new(site, path, name)
-rescue
-  # fail them silently
-end
+Dir.glob([0-9][0-9][0-9][0-9]*).reverse.each do |path|
+  begin
+name = path
+
+site.pages  NewsPage.new(site, path, name)
+  rescue
+# fail them silently
   end
 end
   end



[gentoo-commits] repo/gentoo:master commit in: profiles/base/

2015-08-22 Thread Lars Wendler
commit: f54d512f23ba9ac97442910c51253b1d686cbd09
Author: Lars Wendler polynomial-c AT gentoo DOT org
AuthorDate: Sat Aug 22 12:06:07 2015 +
Commit: Lars Wendler polynomial-c AT gentoo DOT org
CommitDate: Sat Aug 22 12:06:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f54d512f

profiles/base/package.use.mask: Removed old entries.

Signed-off-by: Lars Wendler polynomial-c AT gentoo.org

 profiles/base/package.use.mask | 10 --
 1 file changed, 10 deletions(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 18ced1b..4848c1d 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -299,10 +299,6 @@ sys-infiniband/ofed ofed_drivers_ehca
 # leading to build failures. This is becoming more and more painful...
 =kde-apps/marble-4.12.49. python
 
-# Lars Wendler polynomia...@gentoo.org (12 Apr 2014)
-# Required ffmpeg version still is masked (#507474)
-=media-libs/xine-lib-1.2.5 avformat
-
 # Julian Ospald hasuf...@gentoo.org (06 Apr 2014)
 # broken wrt #501582
 net-misc/openvpn- polarssl
@@ -331,12 +327,6 @@ dev-vcs/git mediawiki
 # Mask because Boost.Context library does not work on most of arches
 dev-libs/boost context
 
-# Lars Wendler polynomia...@gentoo.org (26 Dec 2013)
-# Masked until upstream has fixed support with =polarssl-1.3.0
-# (see upstream bug https://github.com/fatbob313/umurmur/issues/24)
-# and affected versions are removed from the tree.
-media-sound/umurmur-0.2.14 polarssl
-
 # Gilles Dartiguelongue e...@gentoo.org (23 Dec 2013)
 # Gstreamer support fails to build due to libtool shortcomings when using
 # an intermediate library as a dependency of another libtool target dependency.



[gentoo-commits] repo/gentoo:master commit in: mail-client/sylpheed/

2015-08-22 Thread Akinori Hattori
commit: c8bf1ad8000ac04777e9a362c289340b3706bdb0
Author: Akinori Hattori hattya AT gmail DOT com
AuthorDate: Sat Aug 22 06:14:32 2015 +
Commit: Akinori Hattori hattya AT gentoo DOT org
CommitDate: Sat Aug 22 06:14:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8bf1ad8

mail-client/sylpheed: drop old

Package-Manager: portage-2.2.20

 mail-client/sylpheed/Manifest |  1 -
 mail-client/sylpheed/sylpheed-3.3.0-r1.ebuild | 60 ---
 mail-client/sylpheed/sylpheed-3.3.0.ebuild| 55 
 3 files changed, 116 deletions(-)

diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index 5df0a22..3fbd7e7 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,3 +1,2 @@
-DIST sylpheed-3.3.0.tar.bz2 3294536 SHA256 
4d8f791aaf0f347439512aec72cd8262f90e020352cb2f7b63727ac5bc07353b SHA512 
75e2a7573b2eba0f54386e020a82daee7219e45cd032b4568b04362c88fe84bdde6a4023e1259ea06767944c32f605d739121aa7e389b4538924c6eefafff372
 WHIRLPOOL 
c31a173f6f39cf4177bb32083efc97387d9477e11f270f08de7cb650f2af997a52b0031daa44c0f07d78aab692735c0dd7b1e4f1c887cd1f09cd042d5ddabfe9
 DIST sylpheed-3.4.2.tar.bz2 3474176 SHA256 
198de08d01a5c150adae6b6612da80674bbc7ed59b58bbd7508124b869322ba3 SHA512 
1bfaf5636facb6ca55173e914904be7f9fb9ca98eb440f5b548fbbbe03f5dfb5428801e878f3275d3683e715d0b4bd33f63f69f5f98578ce1a25cef695406b5e
 WHIRLPOOL 
a7dda342adb598027765c5ab6d14ae3e850bf39ff63d90a79927fa2aec1bf539454357cb6dea8664d21f68deeccf78fada264d04b0a14ff311ff5827717c4aa8
 DIST sylpheed-3.4.3.tar.bz2 3474313 SHA256 
09fae954c775073b43ce2f660a6bed1087237659eade1c68913cb86add1fb905 SHA512 
cadae6a6855fae8c2df249d83cfd2d7b214062e3e49c74f6d64b3c2f97a9eb2586f14e2b766715e07fa1b229e4462cd39eee69bd02c26053b1ed93a497c3836b
 WHIRLPOOL 
4d76ba80a60c3f0513b80af8854292712a74e5a9b5d2e53b82de0edee4fea7b76316b807af396bcda918a0e5c9e66b05e4201d89992a443cc3bb582574653431

diff --git a/mail-client/sylpheed/sylpheed-3.3.0-r1.ebuild 
b/mail-client/sylpheed/sylpheed-3.3.0-r1.ebuild
deleted file mode 100644
index ef48c70..000
--- a/mail-client/sylpheed/sylpheed-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION=A lightweight email client and newsreader
-HOMEPAGE=http://sylpheed.sraoss.jp/;
-SRC_URI=http://sylpheed.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2;
-
-LICENSE=GPL-2 LGPL-2.1
-SLOT=0
-KEYWORDS=~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-IUSE=crypt ipv6 ldap nls oniguruma pda spell ssl xface
-
-CDEPEND=x11-libs/gtk+:2
-   nls? ( sys-devel/gettext )
-   crypt? ( app-crypt/gpgme )
-   ldap? ( net-nds/openldap )
-   oniguruma? ( dev-libs/oniguruma )
-   pda? ( app-pda/jpilot )
-   spell? ( app-text/gtkspell:2 )
-   ssl? ( dev-libs/openssl )
-RDEPEND=${CDEPEND}
-   app-misc/mime-types
-   net-misc/curl
-DEPEND=${CDEPEND}
-   virtual/pkgconfig
-   xface? ( media-libs/compface )
-
-src_configure() {
-   local htmldir=/usr/share/doc/${PF}/html
-   econf \
-   $(use_enable crypt gpgme) \
-   $(use_enable ipv6) \
-   $(use_enable ldap) \
-   $(use_enable oniguruma) \
-   $(use_enable pda jpilot) \
-   $(use_enable spell gtkspell) \
-   $(use_enable ssl) \
-   $(use_enable xface compface) \
-   --with-manualdir=${htmldir}/manual \
-   --with-faqdir=${htmldir}/faq \
-   --disable-updatecheck
-}
-
-src_install() {
-   emake DESTDIR=${D} install
-   dodoc AUTHORS ChangeLog* NEWS* PLUGIN* README* TODO*
-
-   doicon *.png
-   domenu *.desktop
-
-   cd plugin/attachment_tool
-   docinto plugin/attachment_tool
-   emake DESTDIR=${D} install-plugin
-   dodoc README
-}

diff --git a/mail-client/sylpheed/sylpheed-3.3.0.ebuild 
b/mail-client/sylpheed/sylpheed-3.3.0.ebuild
deleted file mode 100644
index 83efacd..000
--- a/mail-client/sylpheed/sylpheed-3.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION=A lightweight email client and newsreader
-HOMEPAGE=http://sylpheed.sraoss.jp/;
-SRC_URI=http://sylpheed.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2;
-
-LICENSE=GPL-2 LGPL-2.1
-SLOT=0
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-IUSE=crypt ipv6 ldap nls oniguruma pda spell ssl xface
-
-CDEPEND=x11-libs/gtk+:2
-   nls? ( sys-devel/gettext )
-   crypt? ( app-crypt/gpgme )
-   ldap? ( net-nds/openldap )
-   oniguruma? ( dev-libs/oniguruma )
-   pda? ( app-pda/jpilot )
-   spell? ( app-text/gtkspell:2 )
-   ssl? ( dev-libs/openssl )
-RDEPEND=${CDEPEND}
-   

[gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/

2015-08-22 Thread Michael Palimaka
commit: da22b4db31a350baa7f8abde429a99e5c36a52a3
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sat Aug 22 06:33:38 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sat Aug 22 06:33:38 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=da22b4db

kde-plasma/kwin: specify Qt SLOT.

Package-Manager: portage-2.2.20.1

 kde-plasma/kwin/kwin-5.3.95.ebuild  | 2 +-
 kde-plasma/kwin/kwin-5.4.0.ebuild   | 2 +-
 kde-plasma/kwin/kwin-5.4.49..ebuild | 2 +-
 kde-plasma/kwin/kwin-.ebuild| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/kwin/kwin-5.3.95.ebuild 
b/kde-plasma/kwin/kwin-5.3.95.ebuild
index 8d3e140..6317043 100644
--- a/kde-plasma/kwin/kwin-5.3.95.ebuild
+++ b/kde-plasma/kwin/kwin-5.3.95.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND=
dev-qt/qtmultimedia:5[gstreamer,qml]
dev-qt/qtscript:5
dev-qt/qtwidgets:5
-   dev-qt/qtx11extras
+   dev-qt/qtx11extras:5
media-libs/libepoxy
x11-libs/libICE
x11-libs/libSM

diff --git a/kde-plasma/kwin/kwin-5.4.0.ebuild 
b/kde-plasma/kwin/kwin-5.4.0.ebuild
index e2ad8d2..7c25a0d 100644
--- a/kde-plasma/kwin/kwin-5.4.0.ebuild
+++ b/kde-plasma/kwin/kwin-5.4.0.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND=
dev-qt/qtmultimedia:5[gstreamer,qml]
dev-qt/qtscript:5
dev-qt/qtwidgets:5
-   dev-qt/qtx11extras
+   dev-qt/qtx11extras:5
media-libs/libepoxy
x11-libs/libICE
x11-libs/libSM

diff --git a/kde-plasma/kwin/kwin-5.4.49..ebuild 
b/kde-plasma/kwin/kwin-5.4.49..ebuild
index 80c634e..02c64a7 100644
--- a/kde-plasma/kwin/kwin-5.4.49..ebuild
+++ b/kde-plasma/kwin/kwin-5.4.49..ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND=
dev-qt/qtmultimedia:5[gstreamer,qml]
dev-qt/qtscript:5
dev-qt/qtwidgets:5
-   dev-qt/qtx11extras
+   dev-qt/qtx11extras:5
media-libs/libepoxy
x11-libs/libICE
x11-libs/libSM

diff --git a/kde-plasma/kwin/kwin-.ebuild b/kde-plasma/kwin/kwin-.ebuild
index 61ad7be..6b00476 100644
--- a/kde-plasma/kwin/kwin-.ebuild
+++ b/kde-plasma/kwin/kwin-.ebuild
@@ -48,7 +48,7 @@ COMMON_DEPEND=
dev-qt/qtscript:5
dev-qt/qtwayland:5
dev-qt/qtwidgets:5
-   dev-qt/qtx11extras
+   dev-qt/qtx11extras:5
media-libs/libepoxy
virtual/libudev:=
x11-libs/libICE



[gentoo-commits] repo/gentoo:master commit in: media-gfx/qiviewer/

2015-08-22 Thread Michael Palimaka
commit: 514845ce15a85868601e1c0b8af67d35baa1b7b1
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sat Aug 22 06:31:35 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sat Aug 22 06:32:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514845ce

media-gfx/qiviewer: specify Qt SLOT.

Package-Manager: portage-2.2.20.1

 media-gfx/qiviewer/qiviewer-0.5.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/qiviewer/qiviewer-0.5.0-r1.ebuild 
b/media-gfx/qiviewer/qiviewer-0.5.0-r1.ebuild
index 1921592..6219748 100644
--- a/media-gfx/qiviewer/qiviewer-0.5.0-r1.ebuild
+++ b/media-gfx/qiviewer/qiviewer-0.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,7 +24,7 @@ RDEPEND=${DEPEND}
 S=${WORKDIR}/${PN}/src
 
 DOC_CONTENTS=If you want support for gif and tiff images
-make sure that you build dev-qt/qtgui
+make sure that you build dev-qt/qtgui:4
 with apropriate USE flags
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: games-board/chessx/

2015-08-22 Thread Michael Palimaka
commit: cc995caab916c4596c7568b4c3ada3a8e22a6782
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sat Aug 22 06:36:46 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sat Aug 22 06:36:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc995caa

games-board/chessx: specify Qt SLOT.

Package-Manager: portage-2.2.20.1

 games-board/chessx/chessx-1.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-board/chessx/chessx-1.3.2.ebuild 
b/games-board/chessx/chessx-1.3.2.ebuild
index 1a94d16..9de4c46 100644
--- a/games-board/chessx/chessx-1.3.2.ebuild
+++ b/games-board/chessx/chessx-1.3.2.ebuild
@@ -23,7 +23,7 @@ RDEPEND=dev-qt/qtprintsupport:5
dev-qt/qtxml:5
sys-libs/zlib
 DEPEND=${RDEPEND}
-   dev-qt/linguist-tools
+   dev-qt/linguist-tools:5
 
 src_prepare() {
epatch ${FILESDIR}/${P}-zlib.patch



[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

2015-08-22 Thread Michael Palimaka
commit: 70b910250a35150dc39dc209a0a70b7624d63818
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sat Aug 22 06:51:21 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sat Aug 22 06:51:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70b91025

app-admin/elektra: specify Qt SLOTs.

Package-Manager: portage-2.2.20.1

 app-admin/elektra/elektra-0.8.12.ebuild | 8 
 app-admin/elektra/elektra-.ebuild   | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-admin/elektra/elektra-0.8.12.ebuild 
b/app-admin/elektra/elektra-0.8.12.ebuild
index d4eaaa0..b1fb7b2 100644
--- a/app-admin/elektra/elektra-0.8.12.ebuild
+++ b/app-admin/elektra/elektra-0.8.12.ebuild
@@ -23,10 +23,10 @@ RDEPEND=dev-libs/libltdl:0[${MULTILIB_USEDEP}]
iconv? ( =virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
java? ( =virtual/jdk-1.8.0 )
qt5? (
-   =dev-qt/qtdeclarative-5.3
-   =dev-qt/qtgui-5.3
-   =dev-qt/qttest-5.3
-   =dev-qt/qtwidgets-5.3
+   =dev-qt/qtdeclarative-5.3:5
+   =dev-qt/qtgui-5.3:5
+   =dev-qt/qttest-5.3:5
+   =dev-qt/qtwidgets-5.3:5
)
uname? ( sys-apps/coreutils )
systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )

diff --git a/app-admin/elektra/elektra-.ebuild 
b/app-admin/elektra/elektra-.ebuild
index 0c88c62..fa4aed6 100644
--- a/app-admin/elektra/elektra-.ebuild
+++ b/app-admin/elektra/elektra-.ebuild
@@ -23,10 +23,10 @@ RDEPEND=dev-libs/libltdl:0[${MULTILIB_USEDEP}]
iconv? ( =virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
java? ( =virtual/jdk-1.8.0 )
qt5? (
-   =dev-qt/qtdeclarative-5.3
-   =dev-qt/qtgui-5.3
-   =dev-qt/qttest-5.3
-   =dev-qt/qtwidgets-5.3
+   =dev-qt/qtdeclarative-5.3:5
+   =dev-qt/qtgui-5.3:5
+   =dev-qt/qttest-5.3:5
+   =dev-qt/qtwidgets-5.3:5
)
uname? ( sys-apps/coreutils )
systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )



[gentoo-commits] repo/gentoo:master commit in: dev-php/twig/

2015-08-22 Thread Brian Evans
commit: 1e4a7bcf3470c415cf147001d071c62b9af6f9ca
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sat Aug 22 13:54:55 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Sat Aug 22 13:54:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4a7bcf

dev-php/twig: Security bump for bug 558420

Package-Manager: portage-2.2.20.1

 dev-php/twig/Manifest   |  1 +
 dev-php/twig/twig-1.20.0.ebuild | 26 ++
 2 files changed, 27 insertions(+)

diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest
index 8aba592..de87f56 100644
--- a/dev-php/twig/Manifest
+++ b/dev-php/twig/Manifest
@@ -1,2 +1,3 @@
 DIST Twig-1.12.3.tgz 81967 SHA256 
1aafe50c3f4c1a16064ff0dd7352edaa732c6dc2bd5a5db704e2a91807ed0922 SHA512 
42887a367ac1ab1b8a201083ef09ba88372a764644c990b19d9ec26bd5edf2032347ca77b6be35d368cb7dcc5fbf8be57286ec1fe2804c22235aeb4aec97a83d
 WHIRLPOOL 
2fe4e331a34e4eade4917695c368e8425dae06fd12fc954815d2791e66f970aad652c1f95a0de2bff84d7b9173a579e92be82b760005b8ebc455cc59ce2bfd49
 DIST Twig-1.16.3.tgz 87723 SHA256 
f5ff9fadf10529e658a2d23abe19301cc799304c7ac85d0d572a341e28767b1f SHA512 
36cf2c01d7550f3e9021d516ba905c34d8759c22ecef2c8a242dede43970af87d7145de22b27a06d077cdee01edbdd8e9d6a9f2f44fa53ed6b53d3e0da9d7abc
 WHIRLPOOL 
36553498fe8aebb10965192b5e346e51ec0aaafee2db6bc1cb7bfa101c2276a20d5cf8970f73daae6c00e52292e0e152fa4938a1074cb0e57ed5cb5ac17f11fa
+DIST Twig-1.20.0.tgz 93341 SHA256 
8f41a64e548d7819daf7c4471a52ab0143836b8edeeba774152973e1f74af5a7 SHA512 
de033a85e1952ce6b2fdf7f27d19757b2de9ad3112aff794bbe7786d37f9e693e1cfb2754b2768e2d7d902df988929bbf2ac8f4a4d3f0c8e21fac12e7b94d4dd
 WHIRLPOOL 
0fe61486952df23516e347b5177ac59766b054caa173d679239be25ad0edb5fb0b1d0acfd0023b0ca62e7c5514131e270514c1808b5e24875935c94e120351b3

diff --git a/dev-php/twig/twig-1.20.0.ebuild b/dev-php/twig/twig-1.20.0.ebuild
new file mode 100644
index 000..f0f6180
--- /dev/null
+++ b/dev-php/twig/twig-1.20.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PHP_PEAR_CHANNEL=${FILESDIR}/channel.xml
+PHP_PEAR_PN=Twig
+PHP_PEAR_URI=pear.twig-project.org
+inherit php-pear-lib-r1
+
+DESCRIPTION=PHP templating engine with syntax similar to Django
+HOMEPAGE=http://twig.sensiolabs.org/;
+
+LICENSE=BSD
+SLOT=0
+KEYWORDS=~amd64 ~x86
+IUSE=
+
+DEPEND=
+RDEPEND=
+
+src_install() {
+   dodoc CHANGELOG README.rst
+   php-pear-lib-r1_src_install
+   rm -r ${D}/usr/share/php/docs
+}



[gentoo-commits] repo/gentoo:master commit in: dev-php/twig/

2015-08-22 Thread Brian Evans
commit: f94a8cbcf50428bf1d05d8f52b34620be4cb87f4
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sat Aug 22 13:55:48 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Sat Aug 22 13:55:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94a8cbc

dev-php/twig: Drop vulernable versions for bug 558420

Package-Manager: portage-2.2.20.1

 dev-php/twig/Manifest   |  2 --
 dev-php/twig/twig-1.12.3.ebuild | 28 
 dev-php/twig/twig-1.16.3.ebuild | 28 
 3 files changed, 58 deletions(-)

diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest
index de87f56..0b88ab6 100644
--- a/dev-php/twig/Manifest
+++ b/dev-php/twig/Manifest
@@ -1,3 +1 @@
-DIST Twig-1.12.3.tgz 81967 SHA256 
1aafe50c3f4c1a16064ff0dd7352edaa732c6dc2bd5a5db704e2a91807ed0922 SHA512 
42887a367ac1ab1b8a201083ef09ba88372a764644c990b19d9ec26bd5edf2032347ca77b6be35d368cb7dcc5fbf8be57286ec1fe2804c22235aeb4aec97a83d
 WHIRLPOOL 
2fe4e331a34e4eade4917695c368e8425dae06fd12fc954815d2791e66f970aad652c1f95a0de2bff84d7b9173a579e92be82b760005b8ebc455cc59ce2bfd49
-DIST Twig-1.16.3.tgz 87723 SHA256 
f5ff9fadf10529e658a2d23abe19301cc799304c7ac85d0d572a341e28767b1f SHA512 
36cf2c01d7550f3e9021d516ba905c34d8759c22ecef2c8a242dede43970af87d7145de22b27a06d077cdee01edbdd8e9d6a9f2f44fa53ed6b53d3e0da9d7abc
 WHIRLPOOL 
36553498fe8aebb10965192b5e346e51ec0aaafee2db6bc1cb7bfa101c2276a20d5cf8970f73daae6c00e52292e0e152fa4938a1074cb0e57ed5cb5ac17f11fa
 DIST Twig-1.20.0.tgz 93341 SHA256 
8f41a64e548d7819daf7c4471a52ab0143836b8edeeba774152973e1f74af5a7 SHA512 
de033a85e1952ce6b2fdf7f27d19757b2de9ad3112aff794bbe7786d37f9e693e1cfb2754b2768e2d7d902df988929bbf2ac8f4a4d3f0c8e21fac12e7b94d4dd
 WHIRLPOOL 
0fe61486952df23516e347b5177ac59766b054caa173d679239be25ad0edb5fb0b1d0acfd0023b0ca62e7c5514131e270514c1808b5e24875935c94e120351b3

diff --git a/dev-php/twig/twig-1.12.3.ebuild b/dev-php/twig/twig-1.12.3.ebuild
deleted file mode 100644
index d17888e..000
--- a/dev-php/twig/twig-1.12.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PHP_PEAR_CHANNEL=${FILESDIR}/channel.xml
-PHP_PEAR_PN=Twig
-PHP_PEAR_URI=pear.twig-project.org
-inherit php-pear-lib-r1
-
-DESCRIPTION=PHP templating engine with syntax similar to Django
-HOMEPAGE=http://twig.sensiolabs.org/;
-
-LICENSE=BSD
-SLOT=0
-KEYWORDS=~amd64 ~x86
-IUSE=
-
-DEPEND=
-RDEPEND=
-
-src_install() {
-   pwd
-   dodoc AUTHORS README.markdown
-   #rm AUTHORS README.markdown
-   php-pear-lib-r1_src_install
-   rm -r ${D}/usr/share/php/docs
-}

diff --git a/dev-php/twig/twig-1.16.3.ebuild b/dev-php/twig/twig-1.16.3.ebuild
deleted file mode 100644
index b3eaca6..000
--- a/dev-php/twig/twig-1.16.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PHP_PEAR_CHANNEL=${FILESDIR}/channel.xml
-PHP_PEAR_PN=Twig
-PHP_PEAR_URI=pear.twig-project.org
-inherit php-pear-lib-r1
-
-DESCRIPTION=PHP templating engine with syntax similar to Django
-HOMEPAGE=http://twig.sensiolabs.org/;
-
-LICENSE=BSD
-SLOT=0
-KEYWORDS=~amd64 ~x86
-IUSE=
-
-DEPEND=
-RDEPEND=
-
-src_install() {
-   pwd
-   dodoc CHANGELOG README.rst
-   #rm AUTHORS README.markdown
-   php-pear-lib-r1_src_install
-   rm -r ${D}/usr/share/php/docs
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/paludis/

2015-08-22 Thread Agostino Sarubbo
commit: 72bb53c19444c5d431d862490412d5678feb5110
Author: Agostino Sarubbo ago AT gentoo DOT org
AuthorDate: Sat Aug 22 14:45:07 2015 +
Commit: Agostino Sarubbo ago AT gentoo DOT org
CommitDate: Sat Aug 22 14:45:07 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72bb53c1

sys-apps/paludis-2.4.0-r0: amd64 stable wrt bug #554534

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches=amd64

 sys-apps/paludis/paludis-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/paludis/paludis-2.4.0.ebuild 
b/sys-apps/paludis/paludis-2.4.0.ebuild
index 725f721..7de0b80 100644
--- a/sys-apps/paludis/paludis-2.4.0.ebuild
+++ b/sys-apps/paludis/paludis-2.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI=http://paludis.exherbo.org/download/${P}.tar.bz2;
 IUSE=doc pbins pink python ruby search-index test xml
 LICENSE=GPL-2 vim
 SLOT=0
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 
 COMMON_DEPEND=
=app-admin/eselect-1.2.13



[gentoo-commits] repo/gentoo:master commit in: sys-apps/paludis/

2015-08-22 Thread Agostino Sarubbo
commit: 8bf84ce4d0e574384335d46a264611d76d4bdb5e
Author: Agostino Sarubbo ago AT gentoo DOT org
AuthorDate: Sat Aug 22 14:45:29 2015 +
Commit: Agostino Sarubbo ago AT gentoo DOT org
CommitDate: Sat Aug 22 14:45:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf84ce4

sys-apps/paludis-2.4.0-r0: x86 stable wrt bug #554534

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches=x86

 sys-apps/paludis/paludis-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/paludis/paludis-2.4.0.ebuild 
b/sys-apps/paludis/paludis-2.4.0.ebuild
index 7de0b80..0a26255 100644
--- a/sys-apps/paludis/paludis-2.4.0.ebuild
+++ b/sys-apps/paludis/paludis-2.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI=http://paludis.exherbo.org/download/${P}.tar.bz2;
 IUSE=doc pbins pink python ruby search-index test xml
 LICENSE=GPL-2 vim
 SLOT=0
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 
 COMMON_DEPEND=
=app-admin/eselect-1.2.13



[gentoo-commits] proj/eselect:master commit in: /

2015-08-22 Thread Ulrich Müller
commit: ca0a7692f607a3787d3d9fc38142a3822d3c59a9
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Sat Aug 22 14:46:48 2015 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Sat Aug 22 14:46:48 2015 +
URL:https://gitweb.gentoo.org/proj/eselect.git/commit/?id=ca0a7692

Fix revision detection for out-of-tree builds.

* configure.ac (EXTRAVERSION): Fix detection of git revision
for out-of-tree builds.

 ChangeLog| 5 +
 configure.ac | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e5e0d5..da5fefd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-22  Ulrich Müller  u...@gentoo.org
+
+   * configure.ac (EXTRAVERSION): Fix detection of git revision
+   for out-of-tree builds.
+
 2015-08-13  Ulrich Müller  u...@gentoo.org
 
* configure.ac: Update version to 1.4.5.

diff --git a/configure.ac b/configure.ac
index a18f14e..8f38759 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,8 +77,9 @@ AC_SUBST(EPREFIX)
 # Include extra version information when building from git
 AC_MSG_CHECKING([whether building from git])
 EXTRAVERSION=
-if test -d ${GIT_DIR:-.git}; then
-COMMIT=`git describe --long --always HEAD`
+eselect_git_dir=${GIT_DIR:-${srcdir}/.git}
+if test -d ${eselect_git_dir}; then
+COMMIT=`GIT_DIR=${eselect_git_dir} git describe --long --always HEAD`
 if test x$COMMIT != x; then
 EXTRAVERSION=, git commit $COMMIT
 fi



[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/

2015-08-22 Thread Yuta SATOH
commit: 88393869d5034e779bc3b9c8ca16d3f232cd42e1
Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
AuthorDate: Sat Aug 22 12:18:42 2015 +
Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
CommitDate: Sat Aug 22 12:18:42 2015 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=88393869

automatic_updater.sh: support FreeBSD 10.2 amd64/clang environment.

 scripts/automatic_updater.sh | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index 4d620d6..3749286 100755
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -94,15 +94,15 @@ update_freebsd_userland(){
fi
 
emerge -C dev-libs/libelf dev-libs/libexecinfo dev-libs/libiconv 
sys-process/fuser-bsd  :
-   CC=gcc CXX=g++ emerge --nodeps sys-freebsd/freebsd-libexec
-   CC=gcc CXX=g++ USE=build MAKEOPTS=-j1 emerge --nodeps 
sys-freebsd/freebsd-lib
+   CC=gcc CXX=g++ CXXFLAGS=-O2 -pipe emerge --nodeps 
sys-freebsd/freebsd-libexec
+   CC=gcc CXX=g++ CXXFLAGS=-O2 -pipe USE=build MAKEOPTS=-j1 emerge 
--nodeps sys-freebsd/freebsd-lib
+   CC=gcc CXX=g++ CXXFLAGS=-O2 -pipe USE=build emerge --nodeps 
sys-freebsd/freebsd-share
+   [[ -e /etc/portage/profile/package.use.mask ]]  gsed -i 
'/sys-freebsd\/freebsd-libexec abi_x86_32/d' 
/etc/portage/profile/package.use.mask
+
+   CC=gcc CXX=g++ CXXFLAGS=-O2 -pipe emerge boot0 freebsd-bin 
freebsd-lib freebsd-libexec freebsd-mk-defs freebsd-pam-modules freebsd-sbin 
freebsd-share freebsd-ubin freebsd-usbin
if [[ -e /usr/lib/libc++.so ]] ; then
emerge -uN sys-libs/libcxx sys-libs/libcxxrt --exclude 
sys-freebsd/*
fi
-   USE=build emerge --nodeps sys-freebsd/freebsd-share
-   [[ -e /etc/portage/profile/package.use.mask ]]  gsed -i 
'/sys-freebsd\/freebsd-libexec abi_x86_32/d' 
/etc/portage/profile/package.use.mask
-
-   emerge boot0 freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs 
freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin
emerge boot0 freebsd-bin freebsd-lib freebsd-libexec freebsd-mk-defs 
freebsd-pam-modules freebsd-sbin freebsd-share freebsd-ubin freebsd-usbin
 }
 



[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

2015-08-22 Thread Alexis Ballier
commit: 4e0f57752541bcff33121cac92d2b623f79d9b62
Author: Alexis Ballier aballier AT gentoo DOT org
AuthorDate: Sat Aug 22 12:45:36 2015 +
Commit: Alexis Ballier aballier AT gentoo DOT org
CommitDate: Sat Aug 22 12:45:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e0f5775

media-video/ffmpeg: improve librtmp usedesc and keep metadata.xml sorted.

Package-Manager: portage-2.2.20.1

 media-video/ffmpeg/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 8f0f349..dbd3f79 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -27,6 +27,7 @@
flag name=gplBuild GPL code. Should be enabled unless you require 
LGPL binaries./flag
flag name=hardcoded-tablesUse pre-calculated tables rather than 
calculating them on the fly./flag
flag name=iec61883 Support for FireWire DV/HDV input device using 
pkgmedia-libs/libiec61883/pkg./flag
+   flag name=librtmpEnables Real Time Messaging Protocol using librtmp 
(pkgmedia-video/rtmpdump/pkg) in addition to FFmpeg's native 
implementation./flag
flag name=libsoxrEnables audio resampling through 
pkgmedia-libs/soxr/pkg./flag
flag name=libv4lUses pkgmedia-libs/libv4l/pkg for video4linux 
instead of direct calls. Adds support for more devices via the userspace 
library./flag
flag name=mipsdspr1Enables MIPS DSP ASE R1 optimizations./flag
@@ -38,7 +39,6 @@
flag name=picForce shared libraries to be built as PIC (this is 
slower)/flag
flag name=postprocBuild and install libpostproc./flag
flag name=quviAdds support for playing media from Internet services 
using the quvi project./flag
-   flag name=librtmpEnable Real Time Messaging Protocol using 
librtmp/flag
flag name=schroedingerEnable Dirac video support (an advanced 
royalty-free video compression format) via libschroedinger (high-speed 
implementation in C of the Dirac codec)./flag
flag name=snappyEnable pkgapp-arch/snappy/pkg support. Required 
for e.g. Vidvox Hap encoder./flag
flag name=sshEnable SSH/sftp support via 
pkgnet-libs/libssh/pkg./flag



[gentoo-commits] dev/jmbsvicetto:master commit in: www-apps/drupal/files/, www-apps/drupal/

2015-08-22 Thread Jorge Manuel B. S. Vicetto
commit: 5fe8d4a98e88b54f1363336b1c9bd1e8e0d6970c
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo 
DOT org
AuthorDate: Sat Aug 22 12:57:51 2015 +
Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org
CommitDate: Sat Aug 22 12:57:51 2015 +
URL:https://gitweb.gentoo.org/dev/jmbsvicetto.git/commit/?id=5fe8d4a9

Version bump to 6.37 and 7.39 to address DRUPAL-SA-CORE-2015-003 - fixes bug 
558330.
Bump to the latest 8.0.0 beta and update postinstall to point to the Wiki.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT 
gentoo.org

 www-apps/drupal/Manifest |  5 +++--
 .../{drupal-6.36.ebuild = drupal-6.37.ebuild}   |  2 +-
 .../{drupal-7.38.ebuild = drupal-7.39.ebuild}   |  2 +-
 ...drupal-7.38.ebuild = drupal-8.0.0_beta14.ebuild} | 20 
 www-apps/drupal/files/postinstall-en.txt |  2 +-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index add711d..0cc5895 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,4 +1,5 @@
-DIST drupal-6.36.tar.gz 1112226 SHA256 
e70fc70c7bb268e262bfa57d265dcc4c88daf17e918619d607aaac7285d22ac4 SHA512 
ec2ed0875e53291388567de2cc75f20cda0e1dbb14c2f355832053f94275a161db2a1f4b96536f8c71fa2f8547400c924f62e3c326a93d8f58f7dc6bc7bb39ce
 WHIRLPOOL 
260e44bc69fdb02a1e9fb20760fc77d6bf29320a6ce823b7fd0f970554420ad564765c4f153088363c3846699b4e7deae1f024e300280a53de23a81a69bfbf55
-DIST drupal-7.38.tar.gz 3247864 SHA256 
dccf3f12135183e94baaf960ce0993ad99c47afefe830b193cd30a17a317853e SHA512 
b36399283aa370dc325e0d2cf3f2ed7615f6996ee43c79e3cba2c8ecc62a01b59211f24b56dda8f420cac2caa1bb9212f65158abc11c27d5c0b0a345f386cbeb
 WHIRLPOOL 
f678adfba1e63d35539e76dd24d9e680ae85958126a5694a7402be7fe8081a91990755ea71a35322b4c175493ecd7914071741155f119b29c2296f2821a6dcca
+DIST drupal-6.37.tar.gz 1112775 SHA256 
e3db44fdeefa9c4b3edf31816a8cfcaffe300986dbebdc22769ec739d3296d5d SHA512 
4895221c7fb2913618490722629888a4862f28633a49ba5363a0393974941c68d07a3e255d6f380d7d97d0aa3251a76c03d5d0f0ab4c968af301a1207d8d35a0
 WHIRLPOOL 
8d7a0576fba31f2fcf9035755d3ef9a521461d9b3dfab57eb8871fe66038f4056b690a84513bf61a639b4c5f8126fa5180734542b0036f5d089afb0cb2abfecd
+DIST drupal-7.39.tar.gz 3249343 SHA256 
afad72be4389e2a2dfc630fc8582277ed185d884101978890139e0d14e4ddbab SHA512 
5884ec66eac5340272201d524e7346e9bb92772c5451d9d47571e7ba8aac11d3533dabfdbba32339e7fdc691efa6fd22bbb4137633e337f148a2bd0678d3b65e
 WHIRLPOOL 
d2b6fc6e481f8c5966d0ad226fe423851e5c9d91f53283e934903e882485a0a04cbe442aa102424fc8eb9eb9303650aec8db6396b3e8bd7fccd68fb1c2eff25d
 DIST drupal-8.0.0-beta11.tar.gz 10500627 SHA256 
0c7a6b84dc6019bc5afcf3066aa9c2a8a5cd4147a03d48314728156cc434bda1 SHA512 
bdcac51cb8379711245d7e15a3bc879634c6c88af6799525f7dda3cd5be799193a3e4151d902569f9f008d89f309f7bca2180ebca4cb1f21bce87ac744461748
 WHIRLPOOL 
44b1a8670c5dfbf9d5208e5c5dc75a3e4c4a674befa1bd64b10409989d72da01e8e0420d9dc1e7d39b633fa49b80166c0e812f2deeb13304f4850fc777e1b36b
+DIST drupal-8.0.0-beta14.tar.gz 10493263 SHA256 
0dc8e4c9b3ed2f4f9f50741a6d014278d85d98abea3d71a9936b46c2b8249978 SHA512 
09a0c718519518a2536a1b72fbb5c79ee4a63fa453d9669539e87f5c70b9cbb43c42c433174dccd1bcf920a22e7766ca30df88663d6356c709ad958dcd8e968a
 WHIRLPOOL 
62cdae3ed75fd383bca76a9c64a081d0c0a12e7591f2acbd568bf3de00ca7b1e7ffa2fdc126f625dbf07cc88d42f50b9d16b5a6d572b5afe1a8d8616a395b610
 DIST drupal-8.0.0-beta4.tar.gz 9555745 SHA256 
e50aecb08f79c1a11f0a9858dc493d7cc3a0b6293ed74155c5d89fd7ad4441ac SHA512 
0b021f4be93059e67b29e05ff61f33c9c18b4cb27d9b0bcac7525e5c7f02b3b0f187c08602a1961fdddc9fbea2e83e5be73190e13011bd0048461ba30338a04c
 WHIRLPOOL 
33ceebf2a657c8de398de51f550b9ad3e3739560a86ecb8356e8deeedae80ab95c76770fb11280d4908ef55e6191e9a2bfae44c71ef85ea2423752c8466fa753

diff --git a/www-apps/drupal/drupal-6.36.ebuild 
b/www-apps/drupal/drupal-6.37.ebuild
similarity index 99%
rename from www-apps/drupal/drupal-6.36.ebuild
rename to www-apps/drupal/drupal-6.37.ebuild
index ed55f2e..35750de 100644
--- a/www-apps/drupal/drupal-6.36.ebuild
+++ b/www-apps/drupal/drupal-6.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 

diff --git a/www-apps/drupal/drupal-7.38.ebuild 
b/www-apps/drupal/drupal-7.39.ebuild
similarity index 99%
copy from www-apps/drupal/drupal-7.38.ebuild
copy to www-apps/drupal/drupal-7.39.ebuild
index 5b9d193..7340b1a 100644
--- a/www-apps/drupal/drupal-7.38.ebuild
+++ b/www-apps/drupal/drupal-7.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 

diff --git a/www-apps/drupal/drupal-7.38.ebuild 
b/www-apps/drupal/drupal-8.0.0_beta14.ebuild
similarity index 62%
rename from www-apps/drupal/drupal-7.38.ebuild
rename to 

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/hardened-sources/

2015-08-22 Thread Anthony G. Basile
commit: 42a8f0723229c8c74b1a0731b2a10c8d3026dd12
Author: Anthony G. Basile blueness AT gentoo DOT org
AuthorDate: Sat Aug 22 13:03:38 2015 +
Commit: Anthony G. Basile blueness AT gentoo DOT org
CommitDate: Sat Aug 22 13:03:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42a8f072

sys-kernel/hardened-sources: remove older 4.1 series.

Package-Manager: portage-2.2.20.1

 sys-kernel/hardened-sources/Manifest   |  5 ---
 .../hardened-sources/hardened-sources-4.1.4.ebuild | 45 --
 .../hardened-sources-4.1.5-r1.ebuild   | 45 --
 .../hardened-sources/hardened-sources-4.1.5.ebuild | 45 --
 4 files changed, 140 deletions(-)

diff --git a/sys-kernel/hardened-sources/Manifest 
b/sys-kernel/hardened-sources/Manifest
index a8ed85a..5780c00 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -13,8 +13,6 @@ DIST genpatches-3.14-56.base.tar.xz 1032792 SHA256 
8f227c2a9d1c6945604b677080884
 DIST genpatches-3.2-16.base.tar.xz 410332 SHA256 
d3ad97b119c5b8cfd8e34f1cf118dc7d5bbe61fe908a5627f8ab6365517d7190 SHA512 
6c917efbdd26dada3e68241c4d55833968e8ee7044ea7fa2edeffdd4d7eb0edac157057abb75da09ac6d2b5368d228ecd1c2ac6006a9d45b91dbb264eae33625
 WHIRLPOOL 
155a5b3297ec53a6bdb76e20c8c89d4f4c35ed2bb47e20281ce305bf9edd413e4d89168e250a699ace0561c151ef2f484c05e59013dbd971d43184c5f072a71a
 DIST genpatches-3.2-16.extras.tar.xz 16764 SHA256 
c3f5adba6f1700c716354b91bc624115c6f5cae6f8fbdc51d07a76d4546bacaa SHA512 
e3245c05f3385bb27852c00a39a898c91b3c0006e19c5db561f3e41f9bef7e97012ed29ddf9b0e2bd1ba1fa16590e516fb00ce754a84dd5c653c046b9f4e63f9
 WHIRLPOOL 
3c1ee6db88607ed91366067217d4a556fb5516ce8bee2859e97be7e214a05609e2d36ec27ec413154baa432a984f53cf69cfb94ae65ec4b8d2e9a86641d77a0b
 DIST genpatches-4.0-9.base.tar.xz 193344 SHA256 
9d7c65367c1d2f24c6e4c8f8b4b9170a7ddeaa24d6563c5ba5dc41201a7b6e17 SHA512 
646814e63b3b1d78adc172c6f8c0c2605cc9f368bb368be72e169049938617c5c6e738ddcfcbe1e10b58ccd3f9fa09984b03f70076ce0b15137f376594b9066a
 WHIRLPOOL 
0eecbfe1b2b02f00edcab0c975b06bd69a5ff1032fe0c4249d79de555f92f2375d337b2417bddb566e9a1fc66859918b6cbfff6c2c73aea02818434213b0cda1
-DIST genpatches-4.1-7.base.tar.xz 59032 SHA256 
9106e15001e0c286ef929d5e4505507ccdefb0aecdd094b73d57d587070d3288 SHA512 
da1e3ef03874ab0fd3af811d6b72e791117dd7490ecbd8698e24e98424175c0ad7228182976fdadbc62a3ef69bf721f82d99cc1760417c4ba3401844fe3c8db4
 WHIRLPOOL 
d3d3623112f118f98db870f48bc3181d6f510fdb4d916a88a832065a2e0df99c1bc5e04db6f7dd09c505f0253b76037965bbaa27103263dd95a713d0428db5ba
-DIST genpatches-4.1-8.base.tar.xz 136372 SHA256 
9be08b05eb8a10387d791d496ec5a4e7eb22c07dabb93bbba21f2aa11fb5be61 SHA512 
67110c4191d8a40a435bd767a8024edac7bb00de507703a3faf5798d484f2d373aa1257bb23209f0151c394b08fb2577af5b8bd621a6654bfdbc247e4a083c58
 WHIRLPOOL 
26e727302e2c790805748e85610c5673e7b0c2869be9bf2938df07c18ed15c44ed278c285d073d71c69d83614bdee2c3058b82cb3720188ad91994fdde442820
 DIST genpatches-4.1-9.base.tar.xz 177624 SHA256 
ebb16ec588dfc98222f5a5298de76e693e9d24ac8905af4b1d022b13e3fb9734 SHA512 
59de6e58d054ae5b9ed096d800b8ba8323f8595f505dcae235d88deb6dba5b063239c3d2f9e08092a0c70f14d029936066765b680c44286caa2ea4f10b640bae
 WHIRLPOOL 
1dc51a7a931a0744f824fdab9a463de7cd08127da0bd3424900c2b61f6c78feec2ae83ae4ec9558ad5a74c21e3ddd6a7b7f69c0af3b5f183671e3570c681a0c7
 DIST hardened-patches-3.14.48-1.extras.tar.bz2 997773 SHA256 
e8be8af4006dde34d9174fa659c8cdccc836da340d17d6ccf0aced1f3ae4f1c8 SHA512 
5c7f33594e5063f09d5d5cba75e0ca7d1d08d8cee8f104630ff376364fc340647a9a3d83107abc7d0775273a802b6f22b195df7df21fa0caa21ca070d1af075f
 WHIRLPOOL 
3f050ba87cc7a44ec0c9e79f41f22ebc717e6fe4f822426371473dfbdac6327e600a855987b8af870f343cb41f9e437fc4427e1402e4677a46d7235b22507c09
 DIST hardened-patches-3.14.49-1.extras.tar.bz2 1092342 SHA256 
e1509dac4ca2ec00cf2c7c3ccd67b6240c6e9324f1d2dcf948a4238c6d856c2d SHA512 
5471118ee9742af0d00d0f5437ee183ccc413e2770a8137c3c9b49cde14c9f8746e641367543c9ce9259504fc25e9fe5f462332ab45232598b92cad7573daa15
 WHIRLPOOL 
1633fc9b9300d6dd8acbd0d5f5227477db63ac6138f92162f47eabc32c48a7b7c8352110c05efce47da19e51ad6e82d3c7f1d8c0157c1fa3eb4898c922ed640d
@@ -26,9 +24,6 @@ DIST hardened-patches-3.2.69-14.extras.tar.bz2 2314416 SHA256 
224d23d37d00fc0532
 DIST hardened-patches-3.2.70-1.extras.tar.bz2 2370023 SHA256 
90568422f60aef7a1aa5ac4a8a784e2c3e9f0c0abc853ceac3bb301cb6007c7b SHA512 
51f75e18423daa4cb4c46cb8b093edcf08f04d771e1017c2e660e1cd6339c9cdd7ebb1e868266f1036f4ef4072f66f34532b89968bee635066f81cbfbb62e8ad
 WHIRLPOOL 
9539167bc4072ad0b2999daa06126b3d7e63b0bc20081121be8f2f4e53bec8ac7cab71940d6ec3000bd6becb90e87f818dd6e0e52a19b2592633b622ded8c5ce
 DIST hardened-patches-3.2.71-1.extras.tar.bz2 2369201 SHA256 
3155d9f47b14a1970f3770d3978adfac67fc54bd178e8c02f101c0700a45baab SHA512 

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/hardened-sources/

2015-08-22 Thread Anthony G. Basile
commit: fa42011d2e3f1e3185d8d11eef924a283a8d0f5d
Author: Anthony G. Basile blueness AT gentoo DOT org
AuthorDate: Sat Aug 22 13:01:36 2015 +
Commit: Anthony G. Basile blueness AT gentoo DOT org
CommitDate: Sat Aug 22 13:01:59 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa42011d

sys-kernel/hardened-sources: 4.1.6 stable on amd64 and x86.

Gentoo-Bug: 558282

Package-Manager: portage-2.2.20.1

 sys-kernel/hardened-sources/hardened-sources-4.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/hardened-sources/hardened-sources-4.1.6.ebuild 
b/sys-kernel/hardened-sources/hardened-sources-4.1.6.ebuild
index c74967d..a0e1692 100644
--- a/sys-kernel/hardened-sources/hardened-sources-4.1.6.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.1.6.ebuild
@@ -25,7 +25,7 @@ DESCRIPTION=Hardened kernel sources (kernel series 
${KV_MAJOR}.${KV_MINOR})
 HOMEPAGE=http://www.gentoo.org/proj/en/hardened/;
 IUSE=deblob
 
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 
 RDEPEND==sys-devel/gcc-4.5
 



[gentoo-commits] repo/gentoo:master commit in: www-apps/drupal/files/, www-apps/drupal/

2015-08-22 Thread Jorge Manuel B. S. Vicetto
commit: 43ea4a41b7fdf7d18701c06267d665fbcf1634df
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo 
DOT org
AuthorDate: Sat Aug 22 13:31:06 2015 +
Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org
CommitDate: Sat Aug 22 13:31:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43ea4a41

Version bump to 6.37 and 7.39 to address DRUPAL-SA-CORE-2015-003 - fixes bug 
558330.
Bump to the latest 8.0.0 beta and update postinstall to point to the Wiki.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT 
gentoo.org

 www-apps/drupal/Manifest   |  5 +++--
 .../drupal/{drupal-6.36.ebuild = drupal-6.37.ebuild}  |  0
 .../drupal/{drupal-7.38.ebuild = drupal-7.39.ebuild}  |  0
 .../{drupal-7.38.ebuild = drupal-8.0.0_beta14.ebuild} | 18 +++---
 www-apps/drupal/files/postinstall-en.txt   |  2 +-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 8c8faab..e0515da 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,3 +1,4 @@
-DIST drupal-6.36.tar.gz 1112226 SHA256 
e70fc70c7bb268e262bfa57d265dcc4c88daf17e918619d607aaac7285d22ac4 SHA512 
ec2ed0875e53291388567de2cc75f20cda0e1dbb14c2f355832053f94275a161db2a1f4b96536f8c71fa2f8547400c924f62e3c326a93d8f58f7dc6bc7bb39ce
 WHIRLPOOL 
260e44bc69fdb02a1e9fb20760fc77d6bf29320a6ce823b7fd0f970554420ad564765c4f153088363c3846699b4e7deae1f024e300280a53de23a81a69bfbf55
-DIST drupal-7.38.tar.gz 3247864 SHA256 
dccf3f12135183e94baaf960ce0993ad99c47afefe830b193cd30a17a317853e SHA512 
b36399283aa370dc325e0d2cf3f2ed7615f6996ee43c79e3cba2c8ecc62a01b59211f24b56dda8f420cac2caa1bb9212f65158abc11c27d5c0b0a345f386cbeb
 WHIRLPOOL 
f678adfba1e63d35539e76dd24d9e680ae85958126a5694a7402be7fe8081a91990755ea71a35322b4c175493ecd7914071741155f119b29c2296f2821a6dcca
+DIST drupal-6.37.tar.gz 1112775 SHA256 
e3db44fdeefa9c4b3edf31816a8cfcaffe300986dbebdc22769ec739d3296d5d SHA512 
4895221c7fb2913618490722629888a4862f28633a49ba5363a0393974941c68d07a3e255d6f380d7d97d0aa3251a76c03d5d0f0ab4c968af301a1207d8d35a0
 WHIRLPOOL 
8d7a0576fba31f2fcf9035755d3ef9a521461d9b3dfab57eb8871fe66038f4056b690a84513bf61a639b4c5f8126fa5180734542b0036f5d089afb0cb2abfecd
+DIST drupal-7.39.tar.gz 3249343 SHA256 
afad72be4389e2a2dfc630fc8582277ed185d884101978890139e0d14e4ddbab SHA512 
5884ec66eac5340272201d524e7346e9bb92772c5451d9d47571e7ba8aac11d3533dabfdbba32339e7fdc691efa6fd22bbb4137633e337f148a2bd0678d3b65e
 WHIRLPOOL 
d2b6fc6e481f8c5966d0ad226fe423851e5c9d91f53283e934903e882485a0a04cbe442aa102424fc8eb9eb9303650aec8db6396b3e8bd7fccd68fb1c2eff25d
 DIST drupal-8.0.0-beta11.tar.gz 10500627 SHA256 
0c7a6b84dc6019bc5afcf3066aa9c2a8a5cd4147a03d48314728156cc434bda1 SHA512 
bdcac51cb8379711245d7e15a3bc879634c6c88af6799525f7dda3cd5be799193a3e4151d902569f9f008d89f309f7bca2180ebca4cb1f21bce87ac744461748
 WHIRLPOOL 
44b1a8670c5dfbf9d5208e5c5dc75a3e4c4a674befa1bd64b10409989d72da01e8e0420d9dc1e7d39b633fa49b80166c0e812f2deeb13304f4850fc777e1b36b
+DIST drupal-8.0.0-beta14.tar.gz 10493263 SHA256 
0dc8e4c9b3ed2f4f9f50741a6d014278d85d98abea3d71a9936b46c2b8249978 SHA512 
09a0c718519518a2536a1b72fbb5c79ee4a63fa453d9669539e87f5c70b9cbb43c42c433174dccd1bcf920a22e7766ca30df88663d6356c709ad958dcd8e968a
 WHIRLPOOL 
62cdae3ed75fd383bca76a9c64a081d0c0a12e7591f2acbd568bf3de00ca7b1e7ffa2fdc126f625dbf07cc88d42f50b9d16b5a6d572b5afe1a8d8616a395b610

diff --git a/www-apps/drupal/drupal-6.36.ebuild 
b/www-apps/drupal/drupal-6.37.ebuild
similarity index 100%
rename from www-apps/drupal/drupal-6.36.ebuild
rename to www-apps/drupal/drupal-6.37.ebuild

diff --git a/www-apps/drupal/drupal-7.38.ebuild 
b/www-apps/drupal/drupal-7.39.ebuild
similarity index 100%
copy from www-apps/drupal/drupal-7.38.ebuild
copy to www-apps/drupal/drupal-7.39.ebuild

diff --git a/www-apps/drupal/drupal-7.38.ebuild 
b/www-apps/drupal/drupal-8.0.0_beta14.ebuild
similarity index 63%
rename from www-apps/drupal/drupal-7.38.ebuild
rename to www-apps/drupal/drupal-8.0.0_beta14.ebuild
index 7340b1a..ca6797a 100644
--- a/www-apps/drupal/drupal-7.38.ebuild
+++ b/www-apps/drupal/drupal-8.0.0_beta14.ebuild
@@ -7,10 +7,12 @@ EAPI=5
 inherit webapp
 
 MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION=PHP-based open-source platform and content management system
 HOMEPAGE=http://drupal.org/;
-SRC_URI=http://drupal.org/files/projects/${P}.tar.gz;
+SRC_URI=http://drupal.org/files/projects/${MY_P}.tar.gz;
 
 LICENSE=GPL-2
 KEYWORDS=~alpha ~amd64 ~ppc ~x86
@@ -45,9 +47,11 @@ REQUIRED_USE=|| ( mysql postgres sqlite )
 src_install() {
webapp_src_preinst
 
-   local docs=MAINTAINERS.txt LICENSE.txt INSTALL.txt CHANGELOG.txt 
INSTALL.mysql.txt INSTALL.pgsql.txt INSTALL.sqlite.txt UPGRADE.txt 
+   local docs=LICENSE.txt README.txt core/MAINTAINERS.txt 
core/INSTALL.txt core/CHANGELOG.txt \
+   core/INSTALL.mysql.txt 

[gentoo-commits] repo/gentoo:master commit in: net-mail/notmuch/

2015-08-22 Thread Amadeusz Żołnowski
commit: f6686f845478057742afe0b00b0933db7e9394e5
Author: Amadeusz Żołnowski aidecoe AT gentoo DOT org
AuthorDate: Sat Aug 22 14:39:09 2015 +
Commit: Amadeusz Żołnowski aidecoe AT gentoo DOT org
CommitDate: Sat Aug 22 14:39:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6686f84

net-mail/notmuch: Add sub-slots 3 and 4 to stable versions

Nothing depends directly on libnotmuch.so therefore I skip revision
bump.

Package-Manager: portage-2.2.20.1

 net-mail/notmuch/notmuch-0.18.2.ebuild  | 4 +++-
 net-mail/notmuch/notmuch-0.19-r1.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-mail/notmuch/notmuch-0.18.2.ebuild 
b/net-mail/notmuch/notmuch-0.18.2.ebuild
index f8d0eb4..9651014 100644
--- a/net-mail/notmuch/notmuch-0.18.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.18.2.ebuild
@@ -15,7 +15,9 @@ HOMEPAGE=http://notmuchmail.org/;
 SRC_URI=${HOMEPAGE%/}/releases/${P}.tar.gz
 
 LICENSE=GPL-3
-SLOT=0
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT=0/3
 KEYWORDS=amd64 x86
 REQUIRED_USE=
python? ( ${PYTHON_REQUIRED_USE} )

diff --git a/net-mail/notmuch/notmuch-0.19-r1.ebuild 
b/net-mail/notmuch/notmuch-0.19-r1.ebuild
index 5ae253c..656236c 100644
--- a/net-mail/notmuch/notmuch-0.19-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.19-r1.ebuild
@@ -15,7 +15,9 @@ HOMEPAGE=http://notmuchmail.org/;
 SRC_URI=${HOMEPAGE%/}/releases/${P}.tar.gz
 
 LICENSE=GPL-3
-SLOT=0
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y.  Bump of Y is
+# meant to be binary backward compatible.
+SLOT=0/4
 KEYWORDS=amd64 x86
 REQUIRED_USE=
nmbug? ( python )



[gentoo-commits] repo/gentoo:master commit in: dev-python/pygame_sdl2/

2015-08-22 Thread Julian Ospald
commit: 3c75fc0be6740677f3ab7ce2e61fa5ebb129d867
Author: Julian Ospald hasufell AT gentoo DOT org
AuthorDate: Sat Aug 22 21:36:53 2015 +
Commit: Julian Ospald hasufell AT gentoo DOT org
CommitDate: Sat Aug 22 21:36:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c75fc0b

dev-python/pygame_sdl2: add missing dep dev-python/cython

Gentoo-Bug: 558110
Reported-by: stqn off AT free.fr

 dev-python/pygame_sdl2/pygame_sdl2-6.99.5.ebuild | 3 ++-
 dev-python/pygame_sdl2/pygame_sdl2-6.99.6.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.5.ebuild 
b/dev-python/pygame_sdl2/pygame_sdl2-6.99.5.ebuild
index 6507c34..e162a6e 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.5.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.5.ebuild
@@ -24,7 +24,8 @@ RDEPEND=dev-python/numpy[${PYTHON_USEDEP}]
media-libs/sdl2-ttf
virtual/jpeg:62
 
-DEPEND=${RDEPEND}
+DEPEND=${RDEPEND}
+   dev-python/cython[${PYTHON_USEDEP}]
 
 S=${WORKDIR}/pygame-sdl2-for-renpy-${PV}
 

diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6.ebuild 
b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6.ebuild
index 3496c80..6639671 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6.ebuild
@@ -24,6 +24,7 @@ RDEPEND=dev-python/numpy[${PYTHON_USEDEP}]
media-libs/sdl2-ttf
virtual/jpeg:62
 
-DEPEND=${RDEPEND}
+DEPEND=${RDEPEND}
+   dev-python/cython[${PYTHON_USEDEP}]
 
 S=${WORKDIR}/pygame-sdl2-for-renpy-${PV}



[gentoo-commits] dev/ikelos:master commit in: media-video/get_iplayer/

2015-08-22 Thread Mike Auty
commit: dbc7c7489501d5dfd3ed6a9cb6fd2d24fb342e53
Author: layman layman AT localhost
AuthorDate: Sun Aug 23 01:42:03 2015 +
Commit: Mike Auty ikelos AT gentoo DOT org
CommitDate: Sun Aug 23 01:42:03 2015 +
URL:https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=dbc7c748

Bump get_iplayer.

 media-video/get_iplayer/Manifest   | 6 +++---
 .../{get_iplayer-2.90.ebuild = get_iplayer-2.94.ebuild}   | 7 +++
 media-video/get_iplayer/get_iplayer-.ebuild| 7 +++
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/media-video/get_iplayer/Manifest b/media-video/get_iplayer/Manifest
index 8bdfe34..b4778f8 100644
--- a/media-video/get_iplayer/Manifest
+++ b/media-video/get_iplayer/Manifest
@@ -1,3 +1,3 @@
-DIST get_iplayer-2.90.tar.gz 263109 SHA256 
109bbd5f46d6793181ea393aa38d5384b4ea043a1f29f6828adea939b8461dff SHA512 
6f9ded999d29b4ede1643cd4b231e44f3d1e28ff2d276b114b875da410bb425c2a80f41a0a8c70324c1a19e75f11dc512c190e8789039aaeed5a5df97f36165e
 WHIRLPOOL 
0f44146606835f68d3e44fc99499c994d74726df1502d428ac6f3122880518953aa2b8604f352a6a1c9751f7385864ae657c66282d5be8825988469966aa5c12
-EBUILD get_iplayer-2.90.ebuild 575 SHA256 
070b87ba7bc9bacb0ee6b5221448a34a85f84b18f7383c72d051d444ad4fdd95 SHA512 
5ce178efc41c85d0a99cef3bca8d1a6b4929939b604b1e391086fb741151e13caafdb4370479ef10c9b2cbdbd689c061a16f70823b1ce1615603c08ffea2d59e
 WHIRLPOOL 
5672955d7a9db7747b55fe73d2c9eede3c29ade03fe40feec07f839af083e8a67f89322d87207e44b4a46d6226905a65a2a915386bea50d1c6183944310e2456
-EBUILD get_iplayer-.ebuild 650 SHA256 
580e465a884bf537c132e8363f603544afe9cb1b66f89f6a24fb807e3e71937c SHA512 
c05dd4fc64fc5dcd90ae2b1f82eef0f8c74298cae4f7894111db055d297a4712759aef8b13b99212c8cf1ef5cc3e8411ebb798cdf3fd49fc615568c494d0f29b
 WHIRLPOOL 
83930800af98f3f5f02bee729ff49389f2df95447cb1a38b6aa3abb40a92b781370f1d6cdb8944bf6198c3655b4a7230bbf2cdc2315d63971670e56b5210729c
+DIST get_iplayer-2.94.tar.gz 276644 SHA256 
24fed05b1a732652b71513b36c7e38272a961f0cef8c9b8d6688ba74105fe09a SHA512 
2e91631fa8d8ef384f454a4812f35a4f8af749feba5373d6203d769d85212f09a8c69b076d245dad00739739b8cf7bdf9a3b401a42295365f9fc7494458be906
 WHIRLPOOL 
d06ad47cf4237b707c4c2176951a035acdaf1a407004b20762494f68e992d17816abbc501a4e8d3aca46ad2c8d4bd8f4900a8f7a4ee9561d7a931093d06dd3a9
+EBUILD get_iplayer-2.94.ebuild 574 SHA256 
f3254ac2c51605924294f8a36d09e76a1aa7b4145412ecc217df8472ff437f56 SHA512 
e45da81947236a4f75e6b5290a6b437e8efd00cfbed8906dea1a7b87bf45c91ea73acbec997e0132baf313d36377592128ef81e6e90f52b857b920529c752fce
 WHIRLPOOL 
0a0f7ab5f3cf9e8914602c72f1e053720aec2ab96e9bb7ab1f30c3163e8c697e322a792b6c4d30e0f4861b06d1017d7aa44ee00778fc7d139473e3e6863c5372
+EBUILD get_iplayer-.ebuild 648 SHA256 
2411bea869ff7a5d52401e7ace2641b5d7bdc55ba206d08d437a7e05d083a33e SHA512 
daf7c83e36f166c79fc7b73d45c248a9c57157ab19b21caee390b6fa01ec40b62c0a1a2642c59a1775039c42e618da0a9161b45f07da845257b67318a65a600b
 WHIRLPOOL 
fe6ade24bb0f31c0adebeed4339788b204d7d839ab772647e9cd49d8ed191aae7b03198edfbb30ca92386707489b5c3f17b55e4f618ccd718d912887e08fa01f

diff --git a/media-video/get_iplayer/get_iplayer-2.90.ebuild 
b/media-video/get_iplayer/get_iplayer-2.94.ebuild
similarity index 89%
rename from media-video/get_iplayer/get_iplayer-2.90.ebuild
rename to media-video/get_iplayer/get_iplayer-2.94.ebuild
index 2726621..9df7d6a 100644
--- a/media-video/get_iplayer/get_iplayer-2.90.ebuild
+++ b/media-video/get_iplayer/get_iplayer-2.94.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: Id$
 
-EAPI=2
+EAPI=5
 
 DESCRIPTION=BBC Iplayer downloading application
 HOMEPAGE=http://linuxcentre.net/get_iplayer/;
@@ -27,4 +27,3 @@ src_install() {
insinto /usr/share/${PN}/plugins
doins plugins/*
 }
-

diff --git a/media-video/get_iplayer/get_iplayer-.ebuild 
b/media-video/get_iplayer/get_iplayer-.ebuild
index cd0756a..d63d9e1 100644
--- a/media-video/get_iplayer/get_iplayer-.ebuild
+++ b/media-video/get_iplayer/get_iplayer-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=3
 
-inherit git-2
+inherit git-r3
 
 DESCRIPTION=BBC Iplayer downloading application
 HOMEPAGE=http://linuxcentre.net/get_iplayer/;
@@ -30,4 +30,3 @@ src_install() {
insinto /usr/share/${PN}/plugins
doins plugins/*
 }
-



[gentoo-commits] repo/gentoo:master commit in: media-sound/spotify/

2015-08-22 Thread Matt Thode
commit: 90bc09db27eea43b112365bcb7cc669b861302aa
Author: Matthew Thode prometheanfire AT gentoo DOT org
AuthorDate: Sun Aug 23 03:59:20 2015 +
Commit: Matt Thode prometheanfire AT gentoo DOT org
CommitDate: Sun Aug 23 03:59:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90bc09db

media-sound/spotify: fix typo for bug 557624

Package-Manager: portage-2.2.20.1

 media-sound/spotify/spotify-0.9.17.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/spotify/spotify-0.9.17.1-r1.ebuild 
b/media-sound/spotify/spotify-0.9.17.1-r1.ebuild
index 57214a6..08c1759 100644
--- a/media-sound/spotify/spotify-0.9.17.1-r1.ebuild
+++ b/media-sound/spotify/spotify-0.9.17.1-r1.ebuild
@@ -125,7 +125,7 @@ src_install() {
pax-mark z ${ED}${SPOTIFY_HOME}/Data/SpotifyHelper || die
pax-mark m ${ED}${SPOTIFY_HOME}/${PN} || die
pax-mark m ${ED}${SPOTIFY_HOME}/Data/SpotifyHelper || die
-   eqawarn You have set USE=pax_kernel meaning that you intendto 
run
+   eqawarn You have set USE=pax_kernel meaning that you intend to 
run
eqawarn ${PN} under a PaX enabled kernel.  To do so, we must 
modify
eqawarn the ${PN} binary itself and this *may* lead to 
breakage!  If
eqawarn you suspect that ${PN} is being broken by this 
modification,



[gentoo-commits] proj/gentoo-bsd:master commit in: scripts/

2015-08-22 Thread Yuta SATOH
commit: 9fe2f7f34c896fad111c7f05ae29d7bd840f7176
Author: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
AuthorDate: Sat Aug 22 22:57:44 2015 +
Commit: Yuta SATOH nigoro AT gentoo DOT gr DOT jp
CommitDate: Sat Aug 22 22:57:44 2015 +
URL:https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=9fe2f7f3

automatic_updater.sh: Set the correct TARGETVER in set_profile.

 scripts/automatic_updater.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/automatic_updater.sh b/scripts/automatic_updater.sh
index 3749286..0ab1f22 100755
--- a/scripts/automatic_updater.sh
+++ b/scripts/automatic_updater.sh
@@ -15,9 +15,9 @@ fi
 set_profile(){
emerge --info | head -n 1 | grep clang  :
if [[ $? -eq 0 ]] ; then
-   eselect profile set $(eselect profile list | awk '{print $1}' | 
sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
+   eselect profile set $(eselect profile list | grep 
${TARGETVER} | awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
else
-   eselect profile set $(eselect profile list | grep -v clang | 
awk '{print $1}' | sed 's:\[::g' | sed 's:\]::g' | tail -n 1)
+   eselect profile set $(eselect profile list | grep 
${TARGETVER} | grep -v clang | awk '{print $1}' | sed 's:\[::g' | sed 
's:\]::g' | tail -n 1)
fi
 }
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/

2015-08-22 Thread Matt Turner
commit: d52fcf99d14560cb7b7e2a61c434c2fd466dd07b
Author: Matt Turner mattst88 AT gentoo DOT org
AuthorDate: Sat Aug 22 21:08:58 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Aug 22 21:09:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d52fcf99

media-libs/mesa: Version bump to 11.0.0_rc1.

Package-Manager: portage-2.2.20.1

 media-libs/mesa/Manifest   |   1 +
 media-libs/mesa/mesa-11.0.0_rc1.ebuild | 455 +
 2 files changed, 456 insertions(+)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 5ecb63a..c8dc8b5 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -7,4 +7,5 @@ DIST mesa-10.6.1.tar.xz 7035216 SHA256 
6c80a2b647e57c85dc36e609d9aed17f878f0d8e0
 DIST mesa-10.6.2.tar.xz 7033344 SHA256 
05753d3db4212900927b9894221a1669a10f56786e86a7e818b6e18a0817dca9 SHA512 
feaca60b7cc8310a613bd89d0008fb7807de403ce6782e0e62e47ecba040d3728602778f47c704751cb49f8e2d950de03153b84b66d28203e29a70987b96340b
 WHIRLPOOL 
8b148e7bb36fdcc7c25bb02561489b796f01f82bc74ce1d927987eeeaed5f602647d435c046142f5384aa4fb0369bb4a288281b51a03be712b4af8ed7111bf23
 DIST mesa-10.6.3.tar.xz 7036480 SHA256 
58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d SHA512 
4474e089c0b618d0b0469e31c213d84530f9dd22d4280612f34370578a7e7dfdfd1ac499feae470f032e462f5d7532aafa4416a7dd97d0cd6d9332aec5b6
 WHIRLPOOL 
13f44d38e34b6b03919393918a65d2f47ef20de2b31a27ffb3b74c969414d40b01840652829a749924aa3ae548f2cf0abce8c830bcad6a4365ceedd4908e06cb
 DIST mesa-10.6.5.tar.xz 7037400 SHA256 
fb6fac3c85bcfa9d06b8dd439169f23f0c0924a88e44362e738b99b1feff762f SHA512 
46be6bd683d286bdf9ab8b4c1b1b32f89c95701b8c48cee49b060f5beaacea4540a69b99b4fde0f80acdd8e725552bef17dbd4251b9e977caeb5fd9d0ba56595
 WHIRLPOOL 
dee48a0c680aae01cc39dc9157ea7c4c353b7ffdf543ab1cde8e76612a462ff3e3cb33433abff6d88f6800b71a02cd8cfcc23be98218d3cc4f85f424f3d12474
+DIST mesa-11.0.0-rc1.tar.xz 7250800 SHA256 
4a61c15c5ba9bb2ed6c6d5d622363ac4149bd903966fa3c346ba6f06b05e0767 SHA512 
203af66bf71a7a59d8bbcec9e6a8b3d75666361ffd8e74bc236e8378d628c1dcfeccde3830d56b344274e30ca920243a5fe6cc55d398856632644cac9add0af3
 WHIRLPOOL 
c244003c071601dd997e18993b5ba27c6896c8332b18b0711c343de34e080643d53bfec54a09e62dbd409f0faadf70ba4ce3026e36017736f9a119d768b40baf
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 
31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 
c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2
 WHIRLPOOL 
5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97

diff --git a/media-libs/mesa/mesa-11.0.0_rc1.ebuild 
b/media-libs/mesa/mesa-11.0.0_rc1.ebuild
new file mode 100644
index 000..51b6b0a
--- /dev/null
+++ b/media-libs/mesa/mesa-11.0.0_rc1.ebuild
@@ -0,0 +1,455 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI=git://anongit.freedesktop.org/mesa/mesa
+
+if [[ ${PV} = * ]]; then
+   GIT_ECLASS=git-r3
+   EXPERIMENTAL=true
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR=xorg-x11
+
+MY_P=${P/_/-}
+FOLDER=${PV/_rc*/}
+
+DESCRIPTION=OpenGL-like graphic library for Linux
+HOMEPAGE=http://mesa3d.sourceforge.net/;
+
+if [[ $PV == * ]]; then
+   SRC_URI=
+else
+   SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz;
+fi
+
+LICENSE=MIT
+SLOT=0
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+RESTRICT=!bindist? ( bindist )
+
+INTEL_CARDS=i915 i965 ilo intel
+RADEON_CARDS=r100 r200 r300 r600 radeon radeonsi
+VIDEO_CARDS=${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware
+for card in ${VIDEO_CARDS}; do
+   IUSE_VIDEO_CARDS+= video_cards_${card}
+done
+
+IUSE=${IUSE_VIDEO_CARDS}
+   bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
+   +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
+   wayland xvmc xa kernel_FreeBSD
+
+REQUIRED_USE=
+   d3d9?   ( dri3 gallium )
+   llvm?   ( gallium )
+   opencl? ( gallium llvm )
+   openmax? ( gallium )
+   gles1?  ( egl )
+   gles2?  ( egl )
+   vaapi? ( gallium )
+   vdpau? ( gallium )
+   wayland? ( egl gbm )
+   xa?  ( gallium )
+   video_cards_freedreno?  ( gallium )
+   video_cards_intel?  ( classic )
+   video_cards_i915?   ( || ( classic gallium ) )
+   video_cards_i965?   ( classic )
+   video_cards_ilo?( gallium )
+   video_cards_nouveau? ( || ( classic gallium ) )
+   video_cards_radeon? ( || ( classic gallium ) )

[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/files/, sys-fs/udev/

2015-08-22 Thread Mike Gilbert
commit: 441221345e1852d21798290de7464f97bc07608c
Author: Mike Gilbert floppym AT gentoo DOT org
AuthorDate: Sat Aug 22 22:07:00 2015 +
Commit: Mike Gilbert floppym AT gentoo DOT org
CommitDate: Sat Aug 22 22:07:00 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44122134

sys-fs/udev: Backport build fix on alpha

Bug: https://bugs.gentoo.org/543900

Package-Manager: portage-2.2.20_p134

 sys-fs/udev/Manifest   |  4 ---
 ...e-getxpid-syscall-on-alpha-for-raw_getpid.patch | 30 ++
 sys-fs/udev/udev-224-r2.ebuild |  2 ++
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 9875832..e21e829 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,15 +1,11 @@
-DIST systemd-208-r1.tar.xz 2382904 SHA256 
aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390 SHA512 
c21989b747f5e73ba2311919e1ae558132e4ab2e0d8715c25f51e5e90069e147a52e04280c736ecca6b675af7d79def576171a9b08aaeda45fcd52bcdca011cb
 WHIRLPOOL 
e86fdbf96c75c4c94c9507900a5696ff811f5439e0cb45bdc765dc42c62a855c9d2e7d3414df7ec7e18013d937c9148e42c861d0e28e8b4c2fabebd234fbee03
 DIST systemd-216.tar.xz 3612960 SHA256 
945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 
f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2
 WHIRLPOOL 
505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494
 DIST systemd-217.tar.xz 3694524 SHA256 
a031e6fbcdc7077b37338bae8074d9428ee2fa98033beb4923a62871890f7498 SHA512 
7a0b13330b621ec179499018bfbe9619a91cdbd120ae2067e19cbb9bbc25c80dd0f80aac217d823be1332054439bc9b2153ac78fc1eb231fa0fd55cb3bf7a70f
 WHIRLPOOL 
f22674a629b7b928875b6b06b0cffaf5874cdcb90c44787279cd8ff2a798e5bc525c1058f8b2bfe746d100c4d7686e36a6f604276d5735f7554122e4caad6689
 DIST systemd-218.tar.xz 3782276 SHA256 
1b0768b53b6c6d813a93a4b8fe1f80cf53561b09075010a97c7aa08eee3fd59b SHA512 
c183cce8532ccb4716b84587c96a626eea390202a5469b9d89c8cee7f703e40d7c584e05f29501d375b8cd2a1409d011de564df16f54e27f66b3c3007a6e5bd4
 WHIRLPOOL 
4d0bcf3ddfecd3354d9f4ab13851f8da6baf31e89e64d3b1ac671159f16f23597d88cc2525aece2f867c140fc97e80bce086a5af91f84b8095e2503c13995e6d
 DIST systemd-219.tar.xz 3938228 SHA256 
5c57113454e37c040d0cb481bd960ae7cf3a3fe0a231ff4945259bc74503f2d9 SHA512 
19a92891996723bbd83fe745f365d25b2879a059466670aebb9e9fbb6a79a3ed6e1a93e8b76042605038766cabad3ddb89aff40b4a11ab830ffa7dc64f87234f
 WHIRLPOOL 
440868c47bed26571084009fa86d267c921cd5cbbc63b596c1161ef7f33a1b9427ad315450014cd729c761b27bf42542c3b0b7ca68e09b23fc8f606147e7e9fb
 DIST systemd-220.tar.xz 4036028 SHA256 
3659588c40221ee7257502c0735491f72796dbe17be560013f6d310deb446332 SHA512 
c309b4309f8b8d2d97450fb281053feec7b89227626b69e37f3a0d2154c2810c217e58e218f17da11c04f703c6196cec21c4afdcf63879bc736bbdca058a5da5
 WHIRLPOOL 
2f8974eacb706987e85c7907a517f6b2d47b009f9259a36375537c8bd09bc4774c81e8dc853aa83e644d7c1b579f5113d0bb8a504c7caa5a9240750f9936d561
-DIST udev-208-patches-1.tar.xz 964 SHA256 
b2df84afd8631736aceee1317d332fd9bee347df503aa55cd78bcf1b375e8f75 SHA512 
6e85daaf8639255bbaa76364cda02f8b034ec5f687730a7e3ea7427b53031b4cdcbe1b8758e1474104d52e04781605ee3c1e31bbec2df33c95e606cee8eb0f28
 WHIRLPOOL 
054d1e954c4eacd10fcdacf130bf6cf2dd165f3da10ba5629f4bd8e488a221e8e5d7db3ab821593af8dd92011dee98daadf09e5dd726a4c99861f4abaea6aca0
 DIST udev-216-patches-2.tar.xz 1264 SHA256 
18b7b8f852f11c2ac2a58458462ce686ebec48859562df99c5b9c29c95ddfa3c SHA512 
1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4
 WHIRLPOOL 
8f93f982de2d1fa10f7e3c6541c559f2c881730276498b14d4d27b8577bdb340d49b2dc7a50a40e8a13fcabbbabb3dfa5f1605aa842e325d12c17e82d2dc787b
 DIST udev-217-patches-1.tar.xz 616 SHA256 
80c0e57caa2845164b3fda1a9a74d07763a6b18e55c6e1ec60c0d888cdf24cf8 SHA512 
e0ffd9c515c79da30b51448f1a78f6cc442ca595dd0bcd0f766fee31fd1324af6b820238ab342c8e40d6953ce17b872344deb0e7d1803830952d7dcc6f3479cd
 WHIRLPOOL 
a4e28fdae7b67fcd65a2d0fbf7e080e9dde6b4cdaacaa845d2bffc26717aa8f7a498fc0e6ad6edf8a553759a0f4b4ddb5da768211b294a1b37a21eecc225cf10
 DIST udev-218-patches-1.tar.xz 616 SHA256 
80c0e57caa2845164b3fda1a9a74d07763a6b18e55c6e1ec60c0d888cdf24cf8 SHA512 
e0ffd9c515c79da30b51448f1a78f6cc442ca595dd0bcd0f766fee31fd1324af6b820238ab342c8e40d6953ce17b872344deb0e7d1803830952d7dcc6f3479cd
 WHIRLPOOL 
a4e28fdae7b67fcd65a2d0fbf7e080e9dde6b4cdaacaa845d2bffc26717aa8f7a498fc0e6ad6edf8a553759a0f4b4ddb5da768211b294a1b37a21eecc225cf10
-DIST udev-220-patches-1.tar.xz 1760 SHA256 
ac2e778776db9dc13d431b871d5b67aad378bc4bd0b7108476500313ab9c8d2a SHA512 
0cbaf904a5aadedfc3bd8aee735f700b2489112e51938ea54ed34a7fdef4e8f26749eb251a82bbc409fb631f1abc4f70c732cf9b2de7ced739efd3cfadcd5cc2
 WHIRLPOOL 

[gentoo-commits] proj/x11:master commit in: x11-libs/libdrm/

2015-08-22 Thread Matt Turner
commit: fed4646bd43a238727d2797b0b0ec4a03fcae7b9
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sun Aug 23 03:23:07 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Aug 23 03:23:07 2015 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=fed4646b

x11-libs/libdrm: Delete (moved to main tree).

 x11-libs/libdrm/libdrm-.ebuild | 60 --
 x11-libs/libdrm/metadata.xml   |  9 --
 2 files changed, 69 deletions(-)

diff --git a/x11-libs/libdrm/libdrm-.ebuild 
b/x11-libs/libdrm/libdrm-.ebuild
deleted file mode 100644
index 3e5cc06..000
--- a/x11-libs/libdrm/libdrm-.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION=X.Org libdrm library
-HOMEPAGE=http://dri.freedesktop.org/;
-if [[ ${PV} = * ]]; then
-   EGIT_REPO_URI=git://anongit.freedesktop.org/git/mesa/drm
-else
-   SRC_URI=http://dri.freedesktop.org/${PN}/${P}.tar.bz2;
-fi
-
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux 
~arm-linux ~x86-linux
-VIDEO_CARDS=exynos freedreno intel nouveau omap radeon tegra vmware
-for card in ${VIDEO_CARDS}; do
-   IUSE_VIDEO_CARDS+= video_cards_${card}
-done
-
-IUSE=${IUSE_VIDEO_CARDS} libkms valgrind
-RESTRICT=test # see bug #236845
-
-RDEPEND==dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-   video_cards_intel? ( 
=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
-   abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-DEPEND=${RDEPEND}
-   valgrind? ( dev-util/valgrind )
-
-src_prepare() {
-   if [[ ${PV} = * ]]; then
-   # tests are restricted, no point in building them
-   sed -ie 's/tests //' ${S}/Makefile.am
-   fi
-   xorg-2_src_prepare
-}
-
-src_configure() {
-   XORG_CONFIGURE_OPTIONS=(
-   # Udev is only used by tests now.
-   --disable-udev
-   --disable-cairo-tests
-   $(use_enable video_cards_exynos exynos-experimental-api)
-   $(use_enable video_cards_freedreno freedreno)
-   $(use_enable video_cards_intel intel)
-   $(use_enable video_cards_nouveau nouveau)
-   $(use_enable video_cards_omap omap-experimental-api)
-   $(use_enable video_cards_radeon radeon)
-   $(use_enable video_cards_tegra tegra-experimental-api)
-   $(use_enable video_cards_vmware vmwgfx)
-   $(use_enable libkms)
-   # valgrind installs its .pc file to the pkgconfig for the 
primary arch
-   --enable-valgrind=$(usex valgrind auto no)
-   )
-
-   xorg-2_src_configure
-}

diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
deleted file mode 100644
index 92b2156..000
--- a/x11-libs/libdrm/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-!DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
-pkgmetadata
-herdx11/herd
-use
-flag name='libkms'Enable building of libkms, a library for applications to 
interface with KMS/flag
-flag name='valgrind'Compile in valgrind memory hints/flag
-/use
-/pkgmetadata



[gentoo-commits] proj/x11:master commit in: profiles/

2015-08-22 Thread Matt Turner
commit: 4832330bd6afb0e8bfc535bc32131b0e43b7b8d0
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sun Aug 23 03:27:49 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Aug 23 03:27:49 2015 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=4832330b

profiles/package.mask: Remove entries for packages moved to main tree.

 profiles/package.mask | 2 --
 1 file changed, 2 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index f98e5dc..30d5efc 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -37,7 +37,6 @@
 =x11-drivers/xf86-video-vmware-
 =x11-libs/glamor-
 =x11-libs/libdmx-
-=x11-libs/libdrm-
 =x11-libs/libfontenc-
 =x11-libs/libFS-
 =x11-libs/libICE-
@@ -80,7 +79,6 @@
 =x11-libs/libXxf86dga-
 =x11-libs/libXxf86misc-
 =x11-libs/libXxf86vm-
-=x11-libs/pixman-
 =x11-libs/startup-notification-
 =x11-libs/xcb-util-
 =x11-libs/xcb-util-cursor-



[gentoo-commits] proj/x11:master commit in: x11-base/nouveau-drm/

2015-08-22 Thread Matt Turner
commit: ef4ea211980e4c4c599e46983deda973c6608d3f
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sun Aug 23 03:15:19 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Aug 23 03:15:19 2015 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=ef4ea211

x11-base/nouveau-drm: Delete.

 x11-base/nouveau-drm/nouveau-drm-.ebuild | 54 
 1 file changed, 54 deletions(-)

diff --git a/x11-base/nouveau-drm/nouveau-drm-.ebuild 
b/x11-base/nouveau-drm/nouveau-drm-.ebuild
deleted file mode 100644
index 15681e2..000
--- a/x11-base/nouveau-drm/nouveau-drm-.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit linux-info linux-mod
-
-DESCRIPTION=Nouveau DRM Kernel Modules for X11
-HOMEPAGE=http://nouveau.freedesktop.org/;
-SRC_URI=
-
-LICENSE=MIT
-SLOT=0
-KEYWORDS=~amd64 ~x86
-
-IUSE=
-
-RDEPEND=virtual/linux-sources
-DEPEND=${RDEPEND}
-   dev-vcs/git
-
-S=${WORKDIR}/master
-
-CONFIG_CHECK=~ACPI_VIDEO ~BACKLIGHT_CLASS_DEVICE ~DEBUG_FS !DRM 
~FB_CFB_FILLRECT ~FB_CFB_COPYAREA ~FB_CFB_IMAGEBLIT ~FRAMEBUFFER_CONSOLE 
~!FB_NVIDIA ~!FB_RIVA ~!FB_UVESA ~!FB_VGA16 ~I2C_ALGOBIT ~MXM_WMI ~VGA_ARB
-
-pkg_setup() {
-   linux-mod_pkg_setup
-   if kernel_is le 3 4; then
-   eerror You need kernel 3.5 for nouveau-drm
-   die Incompatible kernel version
-   fi
-   elog Use in-kernel nouveau drm if you experience build issues.
-}
-
-src_unpack() {
-   wget http://people.freedesktop.org/~pq/nouveau-drm/master.tar.gz; || 
die wget failed
-   tar xfz master.tar.gz -C ${WORKDIR} || die untar failed
-   mkdir ${S}/nouveau || die mkdir failed
-   wget -O ${S}/nouveau/Makefile 
http://cgit.freedesktop.org/nouveau/linux-2.6/plain/nouveau/Makefile?h=master-compat;
 || die wget failed
-}
-
-src_compile() {
-   cd nouveau || die cd failed
-   set_arch_to_kernel
-   emake \
-   LINUXDIR=${KERNEL_DIR} \
-   GIT_REVISION=$(zcat ${WORKDIR}/master.tar.gz | git 
get-tar-commit-id)
-}
-
-src_install() {
-   insinto /lib/modules/${KV_FULL}/${PN}
-   doins drivers/gpu/drm/{*/,}*.ko
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2015-08-22 Thread James Le Cuirot
commit: 43edaba3df2cd3ae5a1cbda1743726aed41cb17e
Author: James Le Cuirot chewi AT gentoo DOT org
AuthorDate: Sat Aug 22 20:55:36 2015 +
Commit: James Le Cuirot chewi AT gentoo DOT org
CommitDate: Sat Aug 22 20:58:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43edaba3

dev-java/eclipse-ecj: Remove old

Package-Manager: portage-2.2.20.1

 dev-java/eclipse-ecj/Manifest |  1 -
 dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild | 71 ---
 2 files changed, 72 deletions(-)

diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 952214b..875bb75 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,4 +1,3 @@
 DIST ecjsrc-3.7.2.jar 1366333 SHA256 
755d871c3066f15cfaf5ea84075527eb97c92f9685058c3a326057e797f69e6b SHA512 
53b9800a53d494330ef517983c756d622eaab242552586775f85a694142faa43d348131f9b49ec6ba41066c7d19dcb339eab3140302d46ccbcc7a2edd30e9d32
 WHIRLPOOL 
399d971251b022cea47d6db2ddea6f6b0a325789c5a09661782d7fad2b29840863b406f1c2b5f49b8b34b55ff3283519e63a76aed09305fe92b3a0ec866c6d97
 DIST ecjsrc-4.2.1.jar 1417043 SHA256 
d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 
967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
 WHIRLPOOL 
3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
-DIST ecjsrc-4.4.1.jar 1759152 SHA256 
ba3a471d000ae983498a0f398955e2f09d8c1093880c9f37544d47e5460ff82a SHA512 
27086c4c6d35a07f38e2c5ae3d34314fcdfe8b03fd1bbd3e652acd10195a0ec4a20b312f4cc0d0e8204b824eb230d1730a2aef9d886896b81f26b93eff1ae2d1
 WHIRLPOOL 
1b1da40f61ea5b3768e48dd7b9685b9405e35f3b5019acaeae937335f521819743cb7bacd5a7603ea72a20fe1310c6e28fb57d6c64e46b2035b70335029b2937
 DIST ecjsrc-4.4.2.jar 1764959 SHA256 
ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 
53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 WHIRLPOOL 
5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild
deleted file mode 100644
index 8594099..000
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.4.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE=doc source
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN=ecj
-DMF=R-${PV}-201409250400
-
-DESCRIPTION=Eclipse Compiler for Java
-HOMEPAGE=http://www.eclipse.org/;
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar;
-
-LICENSE=EPL-1.0
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux 
~x86-solaris
-SLOT=4.4
-IUSE=+ant userland_GNU
-
-COMMON_DEP=
-   app-eselect/eselect-java
-RDEPEND=${COMMON_DEP}
-   =virtual/jre-1.6
-DEPEND=${COMMON_DEP}
-   =virtual/jdk-1.6
-   app-arch/unzip
-   userland_GNU? ( sys-apps/findutils )
-PDEPEND=
-   ant? ( ~dev-java/ant-eclipse-ecj-${PV} )
-
-S=${WORKDIR}
-
-JAVA_PKG_WANT_SOURCE=1.6
-JAVA_PKG_WANT_TARGET=1.6
-
-java_prepare() {
-   # These have their own package.
-   rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
-   rm -fr org/eclipse/jdt/internal/antadapter || die
-
-   rm build.xml || die
-}
-
-src_compile() {
-   java-pkg-simple_src_compile
-   find -name *.properties -or -name *.rsc -or -name *.props \
--or -wholename */META-INF/* | xargs jar uvf ${S}/${PN}.jar 
|| die jar update failed
-}
-
-src_install() {
-   java-pkg-simple_src_install
-
-   java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
-   org.eclipse.jdt.internal.compiler.batch.Main
-
-   java-pkg_newjar ${PN}.jar ${MY_PN}.jar
-}
-
-pkg_postinst() {
-   einfo To select between slots of ECJ...
-   einfo  # eselect ecj
-
-   eselect ecj update ecj-${SLOT}
-}
-
-pkg_postrm() {
-   eselect ecj update
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/eclipse-ecj/

2015-08-22 Thread James Le Cuirot
commit: 3e459c24777fe6bcdb6d2803aa30343e9a22a17e
Author: James Le Cuirot chewi AT gentoo DOT org
AuthorDate: Sat Aug 22 20:52:19 2015 +
Commit: James Le Cuirot chewi AT gentoo DOT org
CommitDate: Sat Aug 22 20:58:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e459c24

dev-java/eclipse-ecj: Mark 4.4.2-r1 stable using ALLARCHES policy

Package-Manager: portage-2.2.20.1

 dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild 
b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
index 1e6a3e8..5eed548 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.4.2-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE=http://www.eclipse.org/;
 
SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar;
 
 LICENSE=EPL-1.0
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux 
~x86-linux ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux 
~x86-solaris
 SLOT=4.4
 IUSE=+ant
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/

2015-08-22 Thread James Le Cuirot
commit: 6206ab0230acb84802ea008f5007e2b32b9bb02a
Author: James Le Cuirot chewi AT gentoo DOT org
AuthorDate: Sat Aug 22 20:54:04 2015 +
Commit: James Le Cuirot chewi AT gentoo DOT org
CommitDate: Sat Aug 22 20:58:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6206ab02

dev-java/ant-eclipse-ecj: Mark 4.4.2 stable using ALLARCHES policy

Package-Manager: portage-2.2.20.1

 dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild 
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
index d96a1f2..c27ffb0 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE=http://www.eclipse.org/;
 
SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar;
 
 LICENSE=EPL-1.0
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux 
~x86-solaris
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 SLOT=4.4
 IUSE=
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/ant-eclipse-ecj/

2015-08-22 Thread James Le Cuirot
commit: 36f08724cefb58020a80045403dd61ff4c4c9423
Author: James Le Cuirot chewi AT gentoo DOT org
AuthorDate: Sat Aug 22 20:57:09 2015 +
Commit: James Le Cuirot chewi AT gentoo DOT org
CommitDate: Sat Aug 22 20:58:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36f08724

dev-java/ant-eclipse-ecj: Remove old

Package-Manager: portage-2.2.20.1

 dev-java/ant-eclipse-ecj/Manifest  |  1 -
 .../ant-eclipse-ecj/ant-eclipse-ecj-4.4.1.ebuild   | 48 --
 2 files changed, 49 deletions(-)

diff --git a/dev-java/ant-eclipse-ecj/Manifest 
b/dev-java/ant-eclipse-ecj/Manifest
index 952214b..875bb75 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,4 +1,3 @@
 DIST ecjsrc-3.7.2.jar 1366333 SHA256 
755d871c3066f15cfaf5ea84075527eb97c92f9685058c3a326057e797f69e6b SHA512 
53b9800a53d494330ef517983c756d622eaab242552586775f85a694142faa43d348131f9b49ec6ba41066c7d19dcb339eab3140302d46ccbcc7a2edd30e9d32
 WHIRLPOOL 
399d971251b022cea47d6db2ddea6f6b0a325789c5a09661782d7fad2b29840863b406f1c2b5f49b8b34b55ff3283519e63a76aed09305fe92b3a0ec866c6d97
 DIST ecjsrc-4.2.1.jar 1417043 SHA256 
d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 
967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
 WHIRLPOOL 
3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
-DIST ecjsrc-4.4.1.jar 1759152 SHA256 
ba3a471d000ae983498a0f398955e2f09d8c1093880c9f37544d47e5460ff82a SHA512 
27086c4c6d35a07f38e2c5ae3d34314fcdfe8b03fd1bbd3e652acd10195a0ec4a20b312f4cc0d0e8204b824eb230d1730a2aef9d886896b81f26b93eff1ae2d1
 WHIRLPOOL 
1b1da40f61ea5b3768e48dd7b9685b9405e35f3b5019acaeae937335f521819743cb7bacd5a7603ea72a20fe1310c6e28fb57d6c64e46b2035b70335029b2937
 DIST ecjsrc-4.4.2.jar 1764959 SHA256 
ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 
53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 WHIRLPOOL 
5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721

diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.1.ebuild 
b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.1.ebuild
deleted file mode 100644
index 42f622d..000
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE=doc source
-
-inherit java-pkg-2 java-pkg-simple prefix
-
-DMF=R-${PV}-201409250400
-S=${WORKDIR}
-
-DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
-HOMEPAGE=http://www.eclipse.org/;
-SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/${DMF/.0}/ecjsrc-${PV}.jar;
-
-LICENSE=EPL-1.0
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-SLOT=4.4
-IUSE=
-
-RDEPEND==virtual/jre-1.6
-   ~dev-java/eclipse-ecj-${PV}
-   =dev-java/ant-core-1.7
-DEPEND=${RDEPEND}
-   app-arch/unzip
-   =virtual/jdk-1.6
-
-JAVA_PKG_FILTER_COMPILER=jikes
-
-JAVA_GENTOO_CLASSPATH=ant-core,eclipse-ecj-4.4
-
-java_prepare() {
-   rm build.xml || die
-}
-
-src_compile() {
-   java-pkg-simple_src_compile
-   find -name *.properties | xargs jar uvf ${S}/${PN}.jar || die jar 
update failed
-}
-
-src_install() {
-   java-pkg-simple_src_install
-   insinto /usr/share/java-config-2/compiler
-   doins ${FILESDIR}/ecj-${SLOT}
-   eprefixify ${D}/usr/share/java-config-2/compiler/ecj-${SLOT}
-}



[gentoo-commits] repo/gentoo:master commit in: dev-python/python-cinderclient/

2015-08-22 Thread Matt Thode
commit: f395cffdfb0b3182b2922124d39c92e9bf72b771
Author: Matthew Thode prometheanfire AT gentoo DOT org
AuthorDate: Sun Aug 23 03:02:38 2015 +
Commit: Matt Thode prometheanfire AT gentoo DOT org
CommitDate: Sun Aug 23 03:02:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f395cffd

dev-python/python-cinderclient: fixing typo in dep of python-keystoneclient

Package-Manager: portage-2.2.20.1

 dev-python/python-cinderclient/python-cinderclient-1.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/python-cinderclient/python-cinderclient-1.1.2.ebuild 
b/dev-python/python-cinderclient/python-cinderclient-1.1.2.ebuild
index fa0e674..a6526a6 100644
--- a/dev-python/python-cinderclient/python-cinderclient-1.1.2.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-1.1.2.ebuild
@@ -40,7 +40,7 @@ DEPEND=dev-python/setuptools[${PYTHON_USEDEP}]
 RDEPEND==dev-python/prettytable-0.7[${PYTHON_USEDEP}]
dev-python/prettytable-0.8[${PYTHON_USEDEP}]
=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
-   =dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
+   dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: media-libs/glu/

2015-08-22 Thread Matt Turner
commit: 861d0321896406e263b13c197b345cda862c78ce
Author: Matt Turner mattst88 AT gentoo DOT org
AuthorDate: Sun Aug 23 03:31:02 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Aug 23 03:31:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=861d0321

media-libs/glu: Add git ebuild.

Package-Manager: portage-2.2.20.1

 media-libs/glu/glu-.ebuild | 44 ++
 1 file changed, 44 insertions(+)

diff --git a/media-libs/glu/glu-.ebuild b/media-libs/glu/glu-.ebuild
new file mode 100644
index 000..8d82059
--- /dev/null
+++ b/media-libs/glu/glu-.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI=git://anongit.freedesktop.org/mesa/glu
+
+if [[ ${PV} = * ]]; then
+   AUTOTOOLS_AUTORECONF=1
+   GIT_ECLASS=git-2
+   EXPERIMENTAL=true
+fi
+
+inherit autotools-multilib multilib ${GIT_ECLASS}
+
+DESCRIPTION=The OpenGL Utility Library
+HOMEPAGE=http://cgit.freedesktop.org/mesa/glu/;
+
+if [[ ${PV} = * ]]; then
+   SRC_URI=
+   KEYWORDS=
+else
+   SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/${PN}/${P}.tar.bz2;
+   KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux 
~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+fi
+
+LICENSE=SGI-B-2.0
+SLOT=0
+IUSE=static-libs
+
+DEPEND==virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+RDEPEND=${DEPEND}
+   !media-libs/mesa-9
+   abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+
+src_unpack() {
+   default
+   [[ $PV = * ]]  git-2_src_unpack
+}
+
+src_test() {
+   :;
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/

2015-08-22 Thread Matt Turner
commit: 3551b519d0df9db1a35bbd0f5103a2816fc885f6
Author: Matt Turner mattst88 AT gentoo DOT org
AuthorDate: Sun Aug 23 03:34:37 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Aug 23 03:35:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3551b519

media-libs/mesa: Add git ebuild.

Package-Manager: portage-2.2.20.1

 media-libs/mesa/mesa-.ebuild | 457 +++
 1 file changed, 457 insertions(+)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
new file mode 100644
index 000..3e20f24
--- /dev/null
+++ b/media-libs/mesa/mesa-.ebuild
@@ -0,0 +1,457 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI=git://anongit.freedesktop.org/mesa/mesa
+
+if [[ ${PV} = * ]]; then
+   GIT_ECLASS=git-r3
+   EXPERIMENTAL=true
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR=xorg-x11
+
+MY_P=${P/_/-}
+FOLDER=${PV/_rc*/}
+
+DESCRIPTION=OpenGL-like graphic library for Linux
+HOMEPAGE=http://mesa3d.sourceforge.net/;
+
+if [[ $PV == * ]]; then
+   SRC_URI=
+   KEYWORDS=
+else
+   SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz;
+   KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+fi
+
+LICENSE=MIT
+SLOT=0
+RESTRICT=!bindist? ( bindist )
+
+INTEL_CARDS=i915 i965 ilo intel
+RADEON_CARDS=r100 r200 r300 r600 radeon radeonsi
+VIDEO_CARDS=${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware
+for card in ${VIDEO_CARDS}; do
+   IUSE_VIDEO_CARDS+= video_cards_${card}
+done
+
+IUSE=${IUSE_VIDEO_CARDS}
+   bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
+   +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
+   wayland xvmc xa kernel_FreeBSD
+
+REQUIRED_USE=
+   d3d9?   ( dri3 gallium )
+   llvm?   ( gallium )
+   opencl? ( gallium llvm )
+   openmax? ( gallium )
+   gles1?  ( egl )
+   gles2?  ( egl )
+   vaapi? ( gallium )
+   vdpau? ( gallium )
+   wayland? ( egl gbm )
+   xa?  ( gallium )
+   video_cards_freedreno?  ( gallium )
+   video_cards_intel?  ( classic )
+   video_cards_i915?   ( || ( classic gallium ) )
+   video_cards_i965?   ( classic )
+   video_cards_ilo?( gallium )
+   video_cards_nouveau? ( || ( classic gallium ) )
+   video_cards_radeon? ( || ( classic gallium ) )
+   video_cards_r100?   ( classic )
+   video_cards_r200?   ( classic )
+   video_cards_r300?   ( gallium llvm )
+   video_cards_r600?   ( gallium )
+   video_cards_radeonsi?   ( gallium llvm )
+   video_cards_vmware? ( gallium )
+   ${PYTHON_REQUIRED_USE}
+
+
+LIBDRM_DEPSTRING==x11-libs/libdrm-2.4.64
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND=
+   !x11-base/xorg-server-1.7
+   !=x11-proto/xf86driproto-2.0.3
+   abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+   classic? ( app-eselect/eselect-mesa )
+   gallium? ( app-eselect/eselect-mesa )
+   =app-eselect/eselect-opengl-1.3.0
+   udev? ( kernel_linux? ( =virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
+   =dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+   gbm? ( =virtual/libudev-215:=[${MULTILIB_USEDEP}] )
+   dri3? ( =virtual/libudev-215:=[${MULTILIB_USEDEP}] )
+   =x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+   =x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+   =x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+   =x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+   =x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+   =x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
+   x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+   llvm? (
+   video_cards_radeonsi? ( || (
+   =dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+   =dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+   ) )
+   !video_cards_r600? (
+   video_cards_radeon? ( || (
+   
=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+   
=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+   ) )
+   )
+   =sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
+   )
+   opencl? (
+   app-eselect/eselect-opencl
+   dev-libs/libclc
+   || (
+   
=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+   

[gentoo-commits] proj/x11:master commit in: media-libs/glu/, profiles/

2015-08-22 Thread Matt Turner
commit: b5000c76cc0700486500da5f0f13dc9b5df9902a
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sun Aug 23 03:30:18 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Aug 23 03:30:18 2015 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=b5000c76

media-libs/glu: Delete (moved to main tree).

 media-libs/glu/glu-.ebuild | 43 --
 profiles/package.mask  |  1 -
 2 files changed, 44 deletions(-)

diff --git a/media-libs/glu/glu-.ebuild b/media-libs/glu/glu-.ebuild
deleted file mode 100644
index b1011eb..000
--- a/media-libs/glu/glu-.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI=git://anongit.freedesktop.org/mesa/glu
-
-if [[ ${PV} = * ]]; then
-   AUTOTOOLS_AUTORECONF=1
-   GIT_ECLASS=git-r3
-   EXPERIMENTAL=true
-fi
-
-inherit autotools-multilib multilib ${GIT_ECLASS}
-
-DESCRIPTION=The OpenGL Utility Library
-HOMEPAGE=http://cgit.freedesktop.org/mesa/glu/;
-
-if [[ ${PV} = * ]]; then
-   SRC_URI=
-else
-   SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/${PN}/${P}.tar.bz2;
-fi
-
-LICENSE=SGI-B-2.0
-SLOT=0
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux 
~sparc-solaris ~x64-solaris ~x86-solaris
-IUSE=static-libs
-
-DEPEND=virtual/opengl
-RDEPEND=${DEPEND}
-   !media-libs/mesa-9
-   abi_x86_32? ( !=app-emulation/emul-linux-x86-opengl-20130224 )
-
-src_unpack() {
-   default
-   [[ $PV = * ]]  git-r3_src_unpack
-}
-
-src_test() {
-   :;
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 30d5efc..1d2e7f8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -2,7 +2,6 @@
 =dev-libs/libevdev-
 =dev-libs/wayland-
 =dev-libs/weston-
-=media-libs/glu-
 =media-libs/mesa-
 =x11-apps/mesa-progs-
 =x11-apps/mkfontdir-



[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/

2015-08-22 Thread James Le Cuirot
commit: 84e0bd2ce26ad5948983b359bfbcebf4e34a79e2
Author: James Le Cuirot chewi AT gentoo DOT org
AuthorDate: Sat Aug 22 20:31:08 2015 +
Commit: James Le Cuirot chewi AT gentoo DOT org
CommitDate: Sat Aug 22 20:31:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e0bd2c

www-servers/tomcat: Fix javadoc generation, closes bug #558408

Package-Manager: portage-2.2.20.1

 .../tomcat/files/tomcat-7.0.63-build.xml.patch | 36 +++--
 .../tomcat/files/tomcat-8.0.24-build.xml.patch | 61 +-
 2 files changed, 80 insertions(+), 17 deletions(-)

diff --git a/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch
index 23181e7..481591f 100644
--- a/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-7.0.63-build.xml.patch
@@ -1,6 +1,6 @@
 diff -Naur apache-tomcat-7.0.63-src.orig/build.xml 
apache-tomcat-7.0.63-src/build.xml
 --- apache-tomcat-7.0.63-src.orig/build.xml2015-06-30 09:15:44.0 
+0100
-+++ apache-tomcat-7.0.63-src/build.xml 2015-08-16 14:17:34.594426081 +0100
 apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
 @@ -660,12 +660,14 @@
/fileset
  /copy
@@ -92,7 +92,35 @@ diff -Naur apache-tomcat-7.0.63-src.orig/build.xml 
apache-tomcat-7.0.63-src/buil
  
  antcall target=downloadfile
param name=sourcefile value=${jaxrpc-lib.loc}/
-@@ -2642,7 +2653,7 @@
+@@ -1886,6 +1897,7 @@
+ description=Create the Tomcat javadoc 
+ fail unless=java.7.home
+   message=The java.7.home property must be set for javadoc build/
++!--
+ javadoc packagenames=javax.servlet.*
+   excludepackagenames=javax.servlet.jsp.*
+   sourcepath=${tomcat.dist}/src/java
+@@ -1947,6 +1959,7 @@
+ path location=${ant.core.lib}/
+   /classpath
+ /javadoc
++--
+ javadoc packagenames=javax.websocket.*
+   sourcepath=${tomcat.dist}/src/java
+   destdir=${tomcat.dist}/webapps/docs/websocketapi
+@@ -1985,9 +1998,11 @@
+ path refid=tomcat.webservices.classpath/
+ path location=${ant.core.lib}/
+   /classpath
++!--
+   link href=../servletapi/
+   link href=../jspapi/
+   link href=../elapi/
++--
+   link href=../websocketapi/
+   link href=http://docs.oracle.com/javase/7/docs/api//
+   link 
href=http://commons.apache.org/proper/commons-io/javadocs/api-release//
+@@ -2642,7 +2657,7 @@
/target
  
target name=download-compile
@@ -101,7 +129,7 @@ diff -Naur apache-tomcat-7.0.63-src.orig/build.xml 
apache-tomcat-7.0.63-src/buil
  
  antcall target=downloadfile-2
param name=sourcefile.1 value=${tomcat-native.loc.1}/
-@@ -2699,7 +2710,7 @@
+@@ -2699,7 +2714,7 @@
/target
  
target name=download-test-compile
@@ -110,7 +138,7 @@ diff -Naur apache-tomcat-7.0.63-src.orig/build.xml 
apache-tomcat-7.0.63-src/buil
  
  antcall target=downloadfile
param name=sourcefile value=${junit.loc}/
-@@ -2727,7 +2738,7 @@
+@@ -2727,7 +2742,7 @@
/target
  
target name=download-dist

diff --git a/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch
index 9854c9d..1923d23 100644
--- a/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch
+++ b/www-servers/tomcat/files/tomcat-8.0.24-build.xml.patch
@@ -1,6 +1,6 @@
 diff -Naur apache-tomcat-8.0.24-src.orig/build.xml 
apache-tomcat-8.0.24-src/build.xml
 --- apache-tomcat-8.0.24-src.orig/build.xml2015-07-01 21:25:21.0 
+0100
-+++ apache-tomcat-8.0.24-src/build.xml 2015-08-14 13:45:50.315788075 +0100
 apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
 @@ -697,24 +697,29 @@
manifest=${tomcat.manifests}/annotations-api.jar.manifest /
  
@@ -107,7 +107,42 @@ diff -Naur apache-tomcat-8.0.24-src.orig/build.xml 
apache-tomcat-8.0.24-src/buil
  
  antcall target=downloadfile
param name=sourcefile value=${jaxrpc-lib.loc}/
-@@ -2739,7 +2745,7 @@
+@@ -1882,6 +1888,7 @@
+ 
+   target name=javadoc depends=dist-source,extras-webservices-prepare
+ description=Create the Tomcat javadoc 
++!--
+ javadoc packagenames=javax.servlet.*
+   excludepackagenames=javax.servlet.jsp.*
+   sourcepath=${tomcat.dist}/src/java
+@@ -1940,6 +1947,7 @@
+ path location=${ant.core.lib}/
+   /classpath
+ /javadoc
++--
+ javadoc packagenames=javax.websocket.*
+   sourcepath=${tomcat.dist}/src/java
+   destdir=${tomcat.dist}/webapps/docs/websocketapi
+@@ -1970,15 +1978,17 @@
+   docencoding=UTF-8
+   charset=UTF-8
+   additionalparam=-breakiterator -notimestamp
+-  maxmemory=256m 
++  maxmemory=512m 
+   classpath
+ path refid=compile.classpath/
+ path refid=tomcat.webservices.classpath/
+ path location=${ant.core.lib}/
+   /classpath
++!--
+   link href=../servletapi/
+   link 

[gentoo-commits] repo/gentoo:master commit in: dev-util/ninja/

2015-08-22 Thread Mike Gilbert
commit: 400ce1c529d0e6a0a7e41ffa24e582d696c177f6
Author: Mike Gilbert floppym AT gentoo DOT org
AuthorDate: Sat Aug 22 22:48:28 2015 +
Commit: Mike Gilbert floppym AT gentoo DOT org
CommitDate: Sat Aug 22 22:48:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=400ce1c5

dev-util/ninja: Copy changes from live ebuild and restore ia64 keyword

Package-Manager: portage-2.2.20_p134

 dev-util/ninja/ninja-1.6.0.ebuild | 13 +
 dev-util/ninja/ninja-.ebuild  |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dev-util/ninja/ninja-1.6.0.ebuild 
b/dev-util/ninja/ninja-1.6.0.ebuild
index 1df91aa..4c31a9f 100644
--- a/dev-util/ninja/ninja-1.6.0.ebuild
+++ b/dev-util/ninja/ninja-1.6.0.ebuild
@@ -4,12 +4,17 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
-SRC_URI=https://github.com/martine/${PN}/archive/v${PV}.tar.gz - ${P}.tar.gz
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI=https://github.com/martine/ninja.git;
+else
+   SRC_URI=https://github.com/martine/${PN}/archive/v${PV}.tar.gz - 
${P}.tar.gz
+   KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+fi
 
 DESCRIPTION=A small build system similar to make
 HOMEPAGE=http://github.com/martine/ninja;
@@ -56,7 +61,7 @@ src_compile() {
# configure.py uses CFLAGS instead of CXXFLAGS
export CFLAGS=${CXXFLAGS}
 
-   run_for_build ${PYTHON} bootstrap.py --verbose || die
+   run_for_build ${PYTHON} configure.py --bootstrap --verbose || die
 
if tc-is-cross-compiler; then
mv ninja ninja-build || die

diff --git a/dev-util/ninja/ninja-.ebuild b/dev-util/ninja/ninja-.ebuild
index fa0d563..4c31a9f 100644
--- a/dev-util/ninja/ninja-.ebuild
+++ b/dev-util/ninja/ninja-.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} ==  ]]; then
EGIT_REPO_URI=https://github.com/martine/ninja.git;
 else
SRC_URI=https://github.com/martine/${PN}/archive/v${PV}.tar.gz - 
${P}.tar.gz
-   KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+   KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 fi
 
 DESCRIPTION=A small build system similar to make



[gentoo-commits] dev/ikelos:master commit in: net-misc/kamailio/files/, net-misc/kamailio/

2015-08-22 Thread Mike Auty
commit: d4c7b47d817d7c4a10100970ad160ecceea2cf24
Author: layman layman AT localhost
AuthorDate: Sun Aug 23 01:45:37 2015 +
Commit: Mike Auty ikelos AT gentoo DOT org
CommitDate: Sun Aug 23 01:45:37 2015 +
URL:https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=d4c7b47d

Remove extremely old Kamailio ebuild, check the rion overlay for a more recent 
version.

 net-misc/kamailio/Manifest  |   4 --
 net-misc/kamailio/files/kamailio.confd  |  11 
 net-misc/kamailio/files/kamailio.rc6|  49 ---
 net-misc/kamailio/kamailio-1.4.3.ebuild | 106 
 4 files changed, 170 deletions(-)

diff --git a/net-misc/kamailio/Manifest b/net-misc/kamailio/Manifest
deleted file mode 100644
index a8cded6..000
--- a/net-misc/kamailio/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX kamailio.confd 311 RMD160 cd989d2ceccd645bc7b0e4063c6b07adce313e54 SHA1 
725af68567453ade06e4769d83a47883d9c9cbbf SHA256 
863bdf284647afabd671412d6f8786a779e1ca5c9f6b3d0b3d318bea14c27e0a
-AUX kamailio.rc6 1042 RMD160 b706debd7d0537a26c3e65a78456f9279865fa83 SHA1 
a682727186cbce599a7d38c141f8509c076bef04 SHA256 
b1e601faed6300e90307d049c1434bbcb4108298c3ec7f1d5c3334f41af2306d
-DIST kamailio-1.4.3-tls_src.tar.gz 3471038 RMD160 
5fa7d85ccdc81294bc034840a04c711f18a2c60a SHA1 
3ecd844871b247dbef539eb4c7dc4b1ade06e3d9 SHA256 
0f3fa7ce976d3ca64aa9b3e25c8d8dd4a8dfa6f11029e2368c293cf9125e8c41
-EBUILD kamailio-1.4.3.ebuild 2520 RMD160 
1c1832b17adf756925b80e626a4c11e4e34d62b6 SHA1 
7c62a4f8450e87c7b390115a47fe1dae72a2 SHA256 
ddf5e5f39091e734d3acc6778a402c326b36af46c9c564bc5af5159f6eab082d

diff --git a/net-misc/kamailio/files/kamailio.confd 
b/net-misc/kamailio/files/kamailio.confd
deleted file mode 100644
index bf3cbff..000
--- a/net-misc/kamailio/files/kamailio.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Additional options to start Kamailio with
-#
-# see kamailio -h for a list of options
-#
-# default: run Kamailio as user:group = kamailio:kamailio
-#
-KAMAILIO_OPTS=-u kamailio -g kamailio

diff --git a/net-misc/kamailio/files/kamailio.rc6 
b/net-misc/kamailio/files/kamailio.rc6
deleted file mode 100755
index 1ecf018..000
--- a/net-misc/kamailio/files/kamailio.rc6
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-opts=checkconfig
-
-depend() {
-   need net
-   use mysql postgresql
-}
-
-start() {
-   checkconfig_real || return $?
-
-   ebegin Starting kamailio
-   start-stop-daemon --start --quiet --pidfile /var/run/kamailio.pid \
-   --exec /usr/sbin/kamailio -- ${KAMAILIO_OPTS} -P 
/var/run/kamailio.pid /dev/null
-   eend $?
-}
-
-stop() {
-   ebegin Stopping kamailio
-   start-stop-daemon --stop --quiet --pidfile /var/run/kamailio.pid --exec 
/usr/sbin/kamailio --retry 10
-   eend $?
-}
-
-checkconfig() {
-   ebegin Checking kamailio config file
-   checkconfig_real
-   eend $?
-}
-
-checkconfig_real() {
-   /usr/sbin/kamailio ${KAMAILIO_OPTS} -P /var/run/kamailio.pid -C 
/dev/null 21
-   ret=$?
-   if [ $ret -ne 0 ]; then
-   eerror Kamailio has detected a syntax error in your 
configuration file:
-   /usr/sbin/kamailio ${KAMAILIO_OPTS} -P /var/run/kamailio.pid -C
-   fi
-   return $ret
-}
-
-restart() {
-   checkconfig_real || return $?
-
-   svc_stop
-   svc_start
-}

diff --git a/net-misc/kamailio/kamailio-1.4.3.ebuild 
b/net-misc/kamailio/kamailio-1.4.3.ebuild
deleted file mode 100644
index eb04627..000
--- a/net-misc/kamailio/kamailio-1.4.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-IUSE=ipv6 mysql radius postgres jabber ssl odbc
-
-DESCRIPTION=An Open SIP Express Router
-HOMEPAGE=http://www.kamailio.org/;
-SRC_URI=http://www.${PN}.org/pub/${PN}/${PV}/src/${P}-tls_src.tar.gz;
-
-SLOT=0
-LICENSE=GPL-2
-KEYWORDS=~amd64 ~x86
-
-RDEPEND==sys-devel/bison-1.35
-   =sys-devel/flex-2.5.4a
-   ssl? ( dev-libs/openssl )
-   mysql? ( =dev-db/mysql-3.23.52 )
-   radius? ( =net-dialup/radiusclient-ng-0.5.0 )
-   postgres? ( dev-db/libpq )
-   jabber? ( dev-libs/expat )
-   odbc? ( dev-db/unixODBC )
-
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/${P}-tls
-
-src_unpack() {
-   # unpack ser source
-   unpack ${A}
-   cd ${S}
-
-   use ipv6 || \
-   sed -i -e s/-DUSE_IPV6//g Makefile.defs
-
-   use ssl  \
-   sed -i -e s:^#\(TLS=1\).*:\1: Makefile
-
-   use mysql  KAMODULES=${KAMODULES} db_mysql mysql
-
-   use radius  KAMODULES=${KAMODULES} auth_radius group_radius 

[gentoo-commits] repo/gentoo:master commit in: x11-libs/libdrm/

2015-08-22 Thread Matt Turner
commit: db627d8ffce21e046e92b701329cc9f2e7603c03
Author: Matt Turner mattst88 AT gentoo DOT org
AuthorDate: Sat Aug 22 19:03:02 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Aug 22 19:03:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db627d8f

x11-libs/libdrm: Enable amdgpu with VIDEO_CARDS=radeon.

Package-Manager: portage-2.2.20.1

 x11-libs/libdrm/libdrm-2.4.64.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11-libs/libdrm/libdrm-2.4.64.ebuild 
b/x11-libs/libdrm/libdrm-2.4.64.ebuild
index 3e5cc06..85915f9 100644
--- a/x11-libs/libdrm/libdrm-2.4.64.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.64.ebuild
@@ -49,6 +49,7 @@ src_configure() {
$(use_enable video_cards_nouveau nouveau)
$(use_enable video_cards_omap omap-experimental-api)
$(use_enable video_cards_radeon radeon)
+   $(use_enable video_cards_radeon amdgpu)
$(use_enable video_cards_tegra tegra-experimental-api)
$(use_enable video_cards_vmware vmwgfx)
$(use_enable libkms)



[gentoo-commits] repo/gentoo:master commit in: x11-libs/libdrm/

2015-08-22 Thread Matt Turner
commit: c99099f8ccf96619eabc5664b05d20db5296d781
Author: Matt Turner mattst88 AT gentoo DOT org
AuthorDate: Sat Aug 22 18:57:13 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Aug 22 18:57:13 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c99099f8

x11-libs/libdrm: Version bump to 2.4.64.

Package-Manager: portage-2.2.20.1

 x11-libs/libdrm/Manifest |  1 +
 x11-libs/libdrm/libdrm-2.4.64.ebuild | 60 
 2 files changed, 61 insertions(+)

diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index b28243c..d0eb742 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -8,3 +8,4 @@ DIST libdrm-2.4.56.tar.bz2 590856 SHA256 
e20fbbe092177a8422913d8884a1255477456ab
 DIST libdrm-2.4.58.tar.bz2 573202 SHA256 
b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd SHA512 
26776b3f93fe173f4e0f94668813ec1a756d9f15385d1cad70c7af8d4d5d503aef00e14081c76f6fcac6e0c606e106e47ddf76038f8601b71fc380306536f937
 WHIRLPOOL 
36d8915b3189fd0722f96698ce5e7a94188859c7372631c4126b0e09e8fa6dbd4e34de5e9d62e053c36e9f431d84d68d327be307d69caf92e1016893e77cf190
 DIST libdrm-2.4.59.tar.bz2 592722 SHA256 
68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b SHA512 
b9f61cfd47cf4a02c10e7fe79b0e9c5701383c76425cf4985a9b91d909f905334ca1ace7334aa0a4ab400694ad84a1a3bc1c3f29842d808026702b35fa9f87c3
 WHIRLPOOL 
6b0e1be70164db86152503e4b72373736f0462ff97ffac2c79a6c1fce83d658e6030d5435be5a61c1f6ca50728db4c7e3a5d8f5e48073fc74169696ff1b7c5be
 DIST libdrm-2.4.62.tar.bz2 637472 SHA256 
906c294bdbe1c94c3ca084305d61a6e5a8367f3b4986e6cc13b1e9b3f75931dc SHA512 
f7e2ef79c80dd0c3a837970052b7e66110e9b99d3e87b3cd278646bb4cb39832a9562144016a7e956a85212d9251b191279f5ba25d7e8bc0bfbfc1a311df3873
 WHIRLPOOL 
e9ca493f01598bcb7e5664c531e48e74570a7ee0c754794ed2247314123821509448d62290b594073389ff545a019e24305d365ba7435f933665cc57d85385dc
+DIST libdrm-2.4.64.tar.bz2 640440 SHA256 
b60786fe7d6e42adb3966ce1a658f63fec528d537396381cbda93bcc99a934b6 SHA512 
f4fae23b981c761622b6170ae1f5bc805fc9fe2c5f3531dd45b3e3fcb65c4c4f08d39744c30e2d7f9c14ce6f13dac4a655c0b0ca9785965c59917a4e594e507b
 WHIRLPOOL 
49a96a5d2795f2a9c9fca5cc5808cbfa5e06717d7f4b8221cee55288e16cee503a109321aea04680900fb0bc80e56482a6c8cd15e887eee3d327f0af52706fac

diff --git a/x11-libs/libdrm/libdrm-2.4.64.ebuild 
b/x11-libs/libdrm/libdrm-2.4.64.ebuild
new file mode 100644
index 000..3e5cc06
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.64.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION=X.Org libdrm library
+HOMEPAGE=http://dri.freedesktop.org/;
+if [[ ${PV} = * ]]; then
+   EGIT_REPO_URI=git://anongit.freedesktop.org/git/mesa/drm
+else
+   SRC_URI=http://dri.freedesktop.org/${PN}/${P}.tar.bz2;
+fi
+
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux 
~arm-linux ~x86-linux
+VIDEO_CARDS=exynos freedreno intel nouveau omap radeon tegra vmware
+for card in ${VIDEO_CARDS}; do
+   IUSE_VIDEO_CARDS+= video_cards_${card}
+done
+
+IUSE=${IUSE_VIDEO_CARDS} libkms valgrind
+RESTRICT=test # see bug #236845
+
+RDEPEND==dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+   video_cards_intel? ( 
=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+   abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+DEPEND=${RDEPEND}
+   valgrind? ( dev-util/valgrind )
+
+src_prepare() {
+   if [[ ${PV} = * ]]; then
+   # tests are restricted, no point in building them
+   sed -ie 's/tests //' ${S}/Makefile.am
+   fi
+   xorg-2_src_prepare
+}
+
+src_configure() {
+   XORG_CONFIGURE_OPTIONS=(
+   # Udev is only used by tests now.
+   --disable-udev
+   --disable-cairo-tests
+   $(use_enable video_cards_exynos exynos-experimental-api)
+   $(use_enable video_cards_freedreno freedreno)
+   $(use_enable video_cards_intel intel)
+   $(use_enable video_cards_nouveau nouveau)
+   $(use_enable video_cards_omap omap-experimental-api)
+   $(use_enable video_cards_radeon radeon)
+   $(use_enable video_cards_tegra tegra-experimental-api)
+   $(use_enable video_cards_vmware vmwgfx)
+   $(use_enable libkms)
+   # valgrind installs its .pc file to the pkgconfig for the 
primary arch
+   --enable-valgrind=$(usex valgrind auto no)
+   )
+
+   xorg-2_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/

2015-08-22 Thread Matt Turner
commit: 8ed9a1b7b70fbaba66e327b6b6f04a5195c9b536
Author: Matt Turner mattst88 AT gentoo DOT org
AuthorDate: Sat Aug 22 19:04:14 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Aug 22 19:04:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ed9a1b7

media-libs/mesa: Version bump to 10.6.5.

Package-Manager: portage-2.2.20.1

 media-libs/mesa/Manifest   |   1 +
 media-libs/mesa/mesa-10.6.5.ebuild | 455 +
 2 files changed, 456 insertions(+)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index cbcaeed..5ecb63a 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -6,4 +6,5 @@ DIST mesa-10.5.8.tar.xz 6993084 SHA256 
2866b855c5299a4aed066338c77ff6467c389b2c3
 DIST mesa-10.6.1.tar.xz 7035216 SHA256 
6c80a2b647e57c85dc36e609d9aed17f878f0d8e0cf9ace86d14cf604101e1eb SHA512 
7ba5f4a7e421e6f198c4e80c1f0259071e1115aecdbe2846a7986bcfe1503a6f4a1806126295e3d9f4b6aee63dd107e82c3972ccb8079b9b5baf1f65246d21ab
 WHIRLPOOL 
1e72a397e30e0f02afc18d864aea004f13cc95a925b66538ac1e368dea9f4737168dcf6b6af715ae04331b0626b3bda7aa2affae95575c56edbeaf0177bc3117
 DIST mesa-10.6.2.tar.xz 7033344 SHA256 
05753d3db4212900927b9894221a1669a10f56786e86a7e818b6e18a0817dca9 SHA512 
feaca60b7cc8310a613bd89d0008fb7807de403ce6782e0e62e47ecba040d3728602778f47c704751cb49f8e2d950de03153b84b66d28203e29a70987b96340b
 WHIRLPOOL 
8b148e7bb36fdcc7c25bb02561489b796f01f82bc74ce1d927987eeeaed5f602647d435c046142f5384aa4fb0369bb4a288281b51a03be712b4af8ed7111bf23
 DIST mesa-10.6.3.tar.xz 7036480 SHA256 
58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d SHA512 
4474e089c0b618d0b0469e31c213d84530f9dd22d4280612f34370578a7e7dfdfd1ac499feae470f032e462f5d7532aafa4416a7dd97d0cd6d9332aec5b6
 WHIRLPOOL 
13f44d38e34b6b03919393918a65d2f47ef20de2b31a27ffb3b74c969414d40b01840652829a749924aa3ae548f2cf0abce8c830bcad6a4365ceedd4908e06cb
+DIST mesa-10.6.5.tar.xz 7037400 SHA256 
fb6fac3c85bcfa9d06b8dd439169f23f0c0924a88e44362e738b99b1feff762f SHA512 
46be6bd683d286bdf9ab8b4c1b1b32f89c95701b8c48cee49b060f5beaacea4540a69b99b4fde0f80acdd8e725552bef17dbd4251b9e977caeb5fd9d0ba56595
 WHIRLPOOL 
dee48a0c680aae01cc39dc9157ea7c4c353b7ffdf543ab1cde8e76612a462ff3e3cb33433abff6d88f6800b71a02cd8cfcc23be98218d3cc4f85f424f3d12474
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 
31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 
c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2
 WHIRLPOOL 
5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97

diff --git a/media-libs/mesa/mesa-10.6.5.ebuild 
b/media-libs/mesa/mesa-10.6.5.ebuild
new file mode 100644
index 000..e34dc8c
--- /dev/null
+++ b/media-libs/mesa/mesa-10.6.5.ebuild
@@ -0,0 +1,455 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI=git://anongit.freedesktop.org/mesa/mesa
+
+if [[ ${PV} = * ]]; then
+   GIT_ECLASS=git-r3
+   EXPERIMENTAL=true
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR=xorg-x11
+
+MY_P=${P/_/-}
+FOLDER=${PV/_rc*/}
+
+DESCRIPTION=OpenGL-like graphic library for Linux
+HOMEPAGE=http://mesa3d.sourceforge.net/;
+
+if [[ $PV == * ]]; then
+   SRC_URI=
+else
+   SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz;
+fi
+
+LICENSE=MIT
+SLOT=0
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+RESTRICT=!bindist? ( bindist )
+
+INTEL_CARDS=i915 i965 ilo intel
+RADEON_CARDS=r100 r200 r300 r600 radeon radeonsi
+VIDEO_CARDS=${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware
+for card in ${VIDEO_CARDS}; do
+   IUSE_VIDEO_CARDS+= video_cards_${card}
+done
+
+IUSE=${IUSE_VIDEO_CARDS}
+   bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
+   +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
+   wayland xvmc xa kernel_FreeBSD
+
+REQUIRED_USE=
+   d3d9?   ( dri3 gallium )
+   llvm?   ( gallium )
+   opencl? ( gallium llvm )
+   openmax? ( gallium )
+   gles1?  ( egl )
+   gles2?  ( egl )
+   vaapi? ( gallium )
+   vdpau? ( gallium )
+   wayland? ( egl gbm )
+   xa?  ( gallium )
+   video_cards_freedreno?  ( gallium )
+   video_cards_intel?  ( classic )
+   video_cards_i915?   ( || ( classic gallium ) )
+   video_cards_i965?   ( classic )
+   video_cards_ilo?( gallium )
+   video_cards_nouveau? ( || ( classic gallium ) )
+   video_cards_radeon? ( || ( classic gallium ) )
+   

[gentoo-commits] proj/x11:master commit in: x11-libs/pixman/

2015-08-22 Thread Matt Turner
commit: c9a7568cdfbe5a77c6abcb42c43db667a0641eb8
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sat Aug 22 19:39:07 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Aug 22 19:39:07 2015 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=c9a7568c

x11-libs/pixman: Delete (moved to main tree).

 x11-libs/pixman/metadata.xml   |  8 
 x11-libs/pixman/pixman-.ebuild | 32 
 2 files changed, 40 deletions(-)

diff --git a/x11-libs/pixman/metadata.xml b/x11-libs/pixman/metadata.xml
deleted file mode 100644
index e6a58df..000
--- a/x11-libs/pixman/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-!DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
-pkgmetadata
-herdx11/herd
-use
-   flag name=loongson2fEnable Loongson2f MMI optimizations./flag
-/use
-/pkgmetadata

diff --git a/x11-libs/pixman/pixman-.ebuild 
b/x11-libs/pixman/pixman-.ebuild
deleted file mode 100644
index 7d4e837..000
--- a/x11-libs/pixman/pixman-.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs versionator
-
-EGIT_REPO_URI=git://anongit.freedesktop.org/git/pixman
-DESCRIPTION=Low-level pixel manipulation routines
-
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris ~x86-winnt
-IUSE=altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 
cpu_flags_x86_ssse3
-RDEPEND=abi_x86_32? (
-   !=app-emulation/emul-linux-x86-gtklibs-20131008
-   !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-   )
-
-src_configure() {
-   XORG_CONFIGURE_OPTIONS=(
-   $(use_enable cpu_flags_x86_mmxext mmx)
-   $(use_enable cpu_flags_x86_sse2 sse2)
-   $(use_enable cpu_flags_x86_ssse3 ssse3)
-   $(use_enable altivec vmx)
-   $(use_enable neon arm-neon)
-   $(use_enable iwmmxt arm-iwmmxt)
-   $(use_enable loongson2f loongson-mmi)
-   --disable-gtk
-   --disable-libpng
-   )
-   xorg-2_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/, x11-base/xorg-server/files/

2015-08-22 Thread Sergei Trofimovich
commit: ef0ca3a416ad5b5332da5eb15d388ce7f7845e53
Author: Sergei Trofimovich slyfox AT gentoo DOT org
AuthorDate: Sat Aug 22 20:06:18 2015 +
Commit: Sergei Trofimovich slyfox AT gentoo DOT org
CommitDate: Sat Aug 22 20:10:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0ca3a4

x11-base/xorg-server: fix crash on FlushAllOutput, bug #555776

Bug: https://bugs.freedesktop.org/91316
Bug: https://bugs.gentoo.org/555776

Package-Manager: portage-2.2.20

 ...xorg-server-1.17.2-uninit-clientsWritable.patch |  65 ++
 x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild  | 245 +
 2 files changed, 310 insertions(+)

diff --git 
a/x11-base/xorg-server/files/xorg-server-1.17.2-uninit-clientsWritable.patch 
b/x11-base/xorg-server/files/xorg-server-1.17.2-uninit-clientsWritable.patch
new file mode 100644
index 000..6818196
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.17.2-uninit-clientsWritable.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/show_bug.cgi?id=555776
+
+From 7cc7ffd25d5e50b54cb942d07d4cb160f20ff9c5 Mon Sep 17 00:00:00 2001
+From: Martin Peres martin.pe...@linux.intel.com
+Date: Fri, 17 Jul 2015 17:21:26 +0300
+Subject: [PATCH] os: make sure the clientsWritable fd_set is initialized
+ before use
+
+In WaitForSomething(), the fd_set clientsWritable may be used unitialized when
+the boolean AnyClientsWriteBlocked is set in the WakeupHandler(). This leads to
+a crash in FlushAllOutput() after x11proto's commit
+2c94cdb453bc641246cc8b9a876da9799bee1ce7.
+
+The problem did not manifest before because both the XFD_SIZE and the maximum
+number of clients were set to 256. As the connectionTranslation table was
+initalized for the 256 clients to 0, the test on the index not being 0 was
+aborting before dereferencing the client #0.
+
+As of commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7 in x11proto, the XFD_SIZE
+got bumped to 512. This lead the OutputPending fd_set to have any fd above 256
+to be uninitialized which in turns lead to reading an index after the end of
+the ConnectionTranslation table. This index would then be used to find the
+client corresponding to the fd marked as pending writes and would also result
+to an out-of-bound access which would usually be the fatal one.
+
+Fix this by zeroing the clientsWritable fd_set at the beginning of
+WaitForSomething(). In this case, the bottom part of the loop, which would
+indirectly call FlushAllOutput, will not do any work but the next call to
+select will result in the execution of the right codepath. This is exactly what
+we want because we need to know the writable clients before handling them. In
+the end, it also makes sure that the fds above MaxClient are initialized,
+preventing the crash in FlushAllOutput().
+
+Thanks to everyone involved in tracking this one down!
+
+Reported-by: Karol Herbst freedesk...@karolherbst.de
+Reported-by: Tobias Klausmann tobias.klausm...@mni.thm.de
+Signed-off-by: Martin Peres martin.pe...@linux.intel.com
+Tested-by: Martin Peres martin.pe...@linux.intel.com
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91316
+Cc: Ilia Mirkin  imir...@alum.mit.edu
+Cc: Martin Peres martin.pe...@linux.intel.com
+Cc: Olivier Fourdan ofour...@redhat.com
+Cc: Adam Jackson a...@redhat.com
+Cc: Alan Coopersmith alan.coopersm...@oracle.com
+Cc: Chris Wilson ch...@chris-wilson.co.uk
+---
+ os/WaitFor.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/os/WaitFor.c b/os/WaitFor.c
+index 431f1a6..993c14e 100644
+--- a/os/WaitFor.c
 b/os/WaitFor.c
+@@ -158,6 +158,7 @@ WaitForSomething(int *pClientsReady)
+ Bool someReady = FALSE;
+ 
+ FD_ZERO(clientsReadable);
++FD_ZERO(clientsWritable);
+ 
+ if (nready)
+ SmartScheduleStopTimer();
+-- 
+2.4.5
+

diff --git a/x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild 
b/x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild
new file mode 100644
index 000..8181fa5
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.17.2-r1.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI=git://anongit.freedesktop.org/git/xorg/xserver
+
+DESCRIPTION=X.Org X servers
+SLOT=0/${PV}
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+
+IUSE_SERVERS=dmx kdrive xephyr xnest xorg xvfb
+IUSE=${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib 
+udev unwind wayland
+
+CDEPEND==app-eselect/eselect-opengl-1.3.0
+   dev-libs/openssl
+   media-libs/freetype
+   =x11-apps/iceauth-1.0.2
+   =x11-apps/rgb-1.0.3
+   =x11-apps/xauth-1.0.3
+   x11-apps/xkbcomp
+   =x11-libs/libdrm-2.4.46
+   =x11-libs/libpciaccess-0.12.901
+   =x11-libs/libXau-1.0.4
+   =x11-libs/libXdmcp-1.0.2
+   

[gentoo-commits] repo/gentoo:master commit in: sys-apps/linux-misc-apps/

2015-08-22 Thread Robin H. Johnson
commit: d5da422b82e6f9078d263094d9d40c3e7f630aee
Author: Robin H. Johnson robbat2 AT gentoo DOT org
AuthorDate: Sat Aug 22 20:27:46 2015 +
Commit: Robin H. Johnson robbat2 AT gentoo DOT org
CommitDate: Sat Aug 22 20:41:12 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5da422b

Fix turbostat build  install.

Package-Manager: portage-2.2.18

 sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild 
b/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild
index be86d16..43f20ad 100644
--- a/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild
+++ b/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit versionator eutils toolchain-funcs linux-info autotools flag-o-matic
+inherit versionator eutils toolchain-funcs linux-info flag-o-matic
 
 DESCRIPTION=Misc tools bundled with kernel sources
 HOMEPAGE=http://kernel.org/;
@@ -69,7 +69,7 @@ TARGETS_SIMPLE=(
 # These have a broken make install, no DESTDIR
 TARGET_MAKE_SIMPLE=(
tools/firewire:nosy-dump
-   tools/power/x86/turbostat:../../../../turbostat
+   tools/power/x86/turbostat:turbostat:../../../../turbostat
tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
Documentation/misc-devices/mei:mei-amt-version
 )
@@ -133,8 +133,10 @@ src_compile() {
done
 
for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-   dir=${t/:*} target=${t/*:}
-   einfo Building $dir = $target
+   dir=${t/:*} target_binfile=${t#*:}
+   target=${target_binfile/:*} binfile=${target_binfile/*:}
+   [ -z ${binfile} ]  binfile=$target
+   einfo Building $dir = $binfile (via emake $target)
emake -C $dir ARCH=${karch} $target
done
 }
@@ -148,9 +150,11 @@ src_install() {
done
 
for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-   dir=${t/:*} target=${t/*:}
-   einfo Installing $dir = $target
-   dosbin ${dir}/${target}
+   dir=${t/:*} target_binfile=${t#*:}
+   target=${target_binfile/:*} binfile=${target_binfile/*:}
+   [ -z ${binfile} ]  binfile=$target
+   einfo Installing $dir = $binfile
+   dosbin ${dir}/${binfile}
done
 
newconfd ${FILESDIR}/freefall.confd freefall



[gentoo-commits] repo/gentoo:master commit in: app-portage/gs-pypi/

2015-08-22 Thread Jauhien Piatlicki
commit: a877cc525221793d6a5fb72a017c2c00780d8ee4
Author: Jauhien Piatlicki jauhien AT gentoo DOT org
AuthorDate: Sat Aug 22 21:24:05 2015 +
Commit: Jauhien Piatlicki jauhien AT gentoo DOT org
CommitDate: Sat Aug 22 21:55:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a877cc52

app-portage/gs-pypi: version bump

Package-Manager: portage-2.2.18

 app-portage/gs-pypi/Manifest |  1 +
 app-portage/gs-pypi/gs-pypi-0.2.1.ebuild | 26 ++
 2 files changed, 27 insertions(+)

diff --git a/app-portage/gs-pypi/Manifest b/app-portage/gs-pypi/Manifest
index 91fbd73..afbaab7 100644
--- a/app-portage/gs-pypi/Manifest
+++ b/app-portage/gs-pypi/Manifest
@@ -1,2 +1,3 @@
 DIST gs-pypi-0.1.tar.gz 15351 SHA256 
98a684cad3bb64af397dac5373b57a4bb23a6784dec6f3d049423808d068c1d8 SHA512 
e7d8dabed21de28f327da3163e95ea16dfb63c27d502233c0f6eae7bf3146866498c492795eff5c7126bf56bf6dd1613457290ffab83962741d49bd9254f059f
 WHIRLPOOL 
e7ce64d24302e4daa5ea2fdb96d1f43ccf9c5af1bd28a4de12dce05f73772de495e8c3f459088bac305caab02cae6f97018081d800eb1fadcc2e1ae133302c26
+DIST gs-pypi-0.2.1.tar.gz 16608 SHA256 
34c8e9596373b1348863fdc025edcc7d4cc8bee7a17cc4ce5e0749e56020977c SHA512 
72c04ab621690b0e1e8aee489cef09ed3f04a84b4d1f5e0888913429f24c37e79e320d41c585d7e5a087b8f9e6859f6702c42d81c1086bb51ce77c9949af6ac0
 WHIRLPOOL 
4cd010ae9d7a22b08d15bc54d5f1734d2de970fd2efa6facbdfca870b9ebc384e9a07f46008f12f67b7c38eacb5edec41a41885876a963963277823060b2ee94
 DIST gs-pypi-0.2.tar.gz 16582 SHA256 
17c72368d10d740f31cd84e237a350b10ec1ac0606432fc226a167d0433061ac SHA512 
b28143f6eb85151cee27c24f11fd8e2adae7115120cc38eeaaa9a59af49af9cee8423725db0babc0dec7ef357ed2485f8a360f69db9fb246f1097fc0f3c227b0
 WHIRLPOOL 
dbeae06ece88f1842c8be9b517a386534da433f599bbf6001b5b50fc22cfe0977569651c3b9d41a725a3dacb436991e8679ba403e8cc12528c9674ff1dcf78d6

diff --git a/app-portage/gs-pypi/gs-pypi-0.2.1.ebuild 
b/app-portage/gs-pypi/gs-pypi-0.2.1.ebuild
new file mode 100644
index 000..fa593fb
--- /dev/null
+++ b/app-portage/gs-pypi/gs-pypi-0.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4})
+
+inherit distutils-r1
+
+DESCRIPTION=g-sorcery backend for pypi packages
+HOMEPAGE=https://github.com/jauhien/gs-pypi;
+SRC_URI=https://github.com/jauhien/gs-pypi/archive/${PV}.tar.gz - 
${P}.tar.gz
+
+LICENSE=GPL-2
+SLOT=0
+KEYWORDS=~amd64 ~x86
+
+DEPEND==app-portage/g-sorcery-0.2.1[bson(-),git(-),$(python_gen_usedep 
'python*')]
+   dev-python/beautifulsoup:4[$(python_gen_usedep 'python*')]
+RDEPEND=${DEPEND}
+
+python_install_all() {
+   distutils-r1_python_install_all
+   doman docs/*.8
+}



[gentoo-commits] repo/gentoo:master commit in: app-portage/g-sorcery/

2015-08-22 Thread Jauhien Piatlicki
commit: a9b43764efc5835fe4565002b8b3befa0bac4ce4
Author: Jauhien Piatlicki jauhien AT gentoo DOT org
AuthorDate: Sat Aug 22 21:17:00 2015 +
Commit: Jauhien Piatlicki jauhien AT gentoo DOT org
CommitDate: Sat Aug 22 21:55:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b43764

app-portage/g-sorcery: version bump

Package-Manager: portage-2.2.18

 app-portage/g-sorcery/Manifest   |  1 +
 app-portage/g-sorcery/g-sorcery-0.2.1.ebuild | 37 
 2 files changed, 38 insertions(+)

diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest
index 98d5f8c..b8457de 100644
--- a/app-portage/g-sorcery/Manifest
+++ b/app-portage/g-sorcery/Manifest
@@ -1,2 +1,3 @@
 DIST g-sorcery-0.1.tar.gz 45796 SHA256 
47fbc40864849cb4b9dfe15d79a38310705fc4dd2a7d5c2ef99688f5b31edec6 SHA512 
207776ed65c79365dd65a21b14f3ba38589a2b5f47c3c6ac38691ba7949b9a836f6a8543e443119d6f2381a5f34ee854ecbc7d2f88527301c7cb1e10478406a5
 WHIRLPOOL 
4af6a5267d2c3dc5b9c4932b39dc474419f95c0c279d3211847abd8aa25cb148413815099a8c1866156d2437c673850445fbedd04e00076072c9ed91fc150897
+DIST g-sorcery-0.2.1.tar.gz 55546 SHA256 
369c006bc17b1871fec1e7bb86b672866aaa4a57b59da459a5ee90ac09ef0bfb SHA512 
42c34ed8addaf721583029d5056751810b0a77546f798081c7c605223342fa2a99bd2e30f20f004a8606ccf847108f0e2ef2c479f3cbb55f2fe6648d4ffc075e
 WHIRLPOOL 
5af665c872904e8d01651a103c70949b350f4565f2f798be9d606ece7057326a02bdcf9f7c5c3d2abd582be627924f99919dd28132a3c2450bed23f0d619b0f7
 DIST g-sorcery-0.2.tar.gz 54173 SHA256 
0d37d5f7ad41771fadefef4caa7d75470c334f277d50107b727f8cd4688b5189 SHA512 
9715d468c3eb34eac2bda81b7442d86fc8af984c2115c93682ae6c63d59a9ed3d7d0234df845659ccd991eb304d732ae33e31c217a7916b8dd08e2617984cb32
 WHIRLPOOL 
8e9439c11132f25ef8f21421ff89043773de15211934dbb45e0b409d058f41b347f536f0b88d0f1a7f8632918b08988edeb76897a2b9d087e1f83da55e35fcac

diff --git a/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild 
b/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild
new file mode 100644
index 000..4bbe99c
--- /dev/null
+++ b/app-portage/g-sorcery/g-sorcery-0.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4})
+
+inherit distutils-r1
+
+DESCRIPTION=framework for ebuild generators
+HOMEPAGE=https://github.com/jauhien/g-sorcery;
+SRC_URI=https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz - 
${P}.tar.gz
+
+LICENSE=GPL-2
+SLOT=0
+IUSE=bson git
+KEYWORDS=~amd64 ~hppa ~x86
+
+DEPEND=bson? ( dev-python/pymongo[$(python_gen_usedep 'python*')] )
+   git? ( dev-vcs/git )
+   sys-apps/portage[$(python_gen_usedep 'python*')]
+RDEPEND=${DEPEND}
+PDEPEND==app-portage/layman-2.2.0[g-sorcery(-),$(python_gen_usedep 
'python*')]
+
+python_test() {
+   PYTHONPATH=. ${PYTHON} scripts/run_tests.py
+}
+
+python_install_all() {
+   distutils-r1_python_install_all
+
+   doman docs/*.8
+   dohtml docs/developer_instructions.html
+   diropts -m0777
+   dodir /var/lib/g-sorcery
+}



[gentoo-commits] repo/gentoo:master commit in: net-wireless/broadcom-sta/, net-wireless/broadcom-sta/files/

2015-08-22 Thread Matt Turner
commit: f64619dcd60422663f465644a6f2171b78ec181d
Author: Matt Turner mattst88 AT gentoo DOT org
AuthorDate: Sat Aug 22 19:23:11 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Aug 22 19:23:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f64619dc

net-wireless/broadcom-sta: Add patch for Linux 4.2.

Package-Manager: portage-2.2.20.1
Bug: https://bugs.gentoo.org/557338

 .../broadcom-sta-6.30.223.248-r4.ebuild| 78 ++
 .../broadcom-sta-6.30.223.248-r4-linux-4.2.patch   | 16 +
 2 files changed, 94 insertions(+)

diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248-r4.ebuild 
b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248-r4.ebuild
new file mode 100644
index 000..350bef9
--- /dev/null
+++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248-r4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils linux-info linux-mod
+
+DESCRIPTION=Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver
+HOMEPAGE=http://www.broadcom.com/support/802.11/linux_sta.php;
+SRC_BASE=http://www.broadcom.com/docs/linux_sta/hybrid-v35;
+SRC_URI=x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz )
+   amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )
+   http://www.broadcom.com/docs/linux_sta/README_${PV}.txt - 
README-${P}.txt
+
+LICENSE=Broadcom
+KEYWORDS=-* ~amd64 ~x86
+
+RESTRICT=mirror
+
+DEPEND=virtual/linux-sources
+RDEPEND=
+
+S=${WORKDIR}
+
+MODULE_NAMES=wl(net/wireless)
+MODULESD_WL_ALIASES=(wlan0 wl)
+
+pkg_setup() {
+   # bug #300570
+   # NOTElxnay: module builds correctly anyway with b43 and SSB enabled
+   # make checks non-fatal. The correct fix is blackisting ssb and, perhaps
+   # b43 via udev rules. Moreover, previous fix broke binpkgs support.
+   CONFIG_CHECK=~!B43 ~!BCMA ~!SSB
+   CONFIG_CHECK2=LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP
+   ERROR_B43=B43: If you insist on building this, you must blacklist it!
+   ERROR_BCMA=BCMA: If you insist on building this, you must blacklist 
it!
+   ERROR_SSB=SSB: If you insist on building this, you must blacklist it!
+   ERROR_LIB80211=LIB80211: Please enable it. If you can't find it: 
enabling the driver for \Intel PRO/Wireless 2100\ or \Intel PRO/Wireless 
2200BG\ (IPW2100 or IPW2200) should suffice.
+   ERROR_MAC80211=MAC80211: If you insist on building this, you must 
blacklist it!
+   ERROR_PREEMPT_RCU=PREEMPT_RCU: Please do not set the Preemption Model 
to \Preemptible Kernel\; choose something else.
+   ERROR_LIB80211_CRYPT_TKIP=LIB80211_CRYPT_TKIP: You will need this for 
WPA.
+   if kernel_is ge 3 8 8; then
+   CONFIG_CHECK=${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 
~!PREEMPT_RCU ~!PREEMPT
+   elif kernel_is ge 2 6 32; then
+   CONFIG_CHECK=${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211
+   elif kernel_is ge 2 6 31; then
+   CONFIG_CHECK=${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT 
~!MAC80211
+   elif kernel_is ge 2 6 29; then
+   CONFIG_CHECK=${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT 
COMPAT_NET_DEV_OPS
+   else
+   CONFIG_CHECK=${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP
+   fi
+
+   linux-mod_pkg_setup
+
+   BUILD_PARAMS=-C ${KV_DIR} M=${S}
+   BUILD_TARGETS=wl.ko
+}
+
+src_prepare() {
+   epatch \
+   ${FILESDIR}/${PN}-6.30.223.141-license.patch \
+   ${FILESDIR}/${PN}-6.30.223.141-makefile.patch \
+   ${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch \
+   ${FILESDIR}/${PN}-6.30.223.141-gcc.patch \
+   ${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch \
+   ${FILESDIR}/${PN}-6.30.223.248-r3-linux-3.15-3.18.patch \
+   ${FILESDIR}/${PN}-6.30.223.248-r3-linux-4.0.patch
+   ${FILESDIR}/${PN}-6.30.223.248-r4-linux-4.2.patch
+
+   epatch_user
+}
+
+src_install() {
+   linux-mod_src_install
+
+   dodoc ${DISTDIR}/README-${P}.txt
+}

diff --git 
a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r4-linux-4.2.patch 
b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r4-linux-4.2.patch
new file mode 100644
index 000..9e9f8a1
--- /dev/null
+++ 
b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.248-r4-linux-4.2.patch
@@ -0,0 +1,16 @@
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index ea0726f..1541dad 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
 b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -2047,7 +2047,11 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, 
struct net_device *ndev,
+   }
+   else if ((event == WLC_E_LINK  ~(flags  WLC_EVENT_MSG_LINK)) 
||
+   event == WLC_E_DEAUTH_IND || event == 
WLC_E_DISASSOC_IND) {
++#if LINUX_VERSION_CODE = 

[gentoo-commits] repo/gentoo:master commit in: x11-libs/pixman/

2015-08-22 Thread Matt Turner
commit: 444b68b693ef382a8a007d40cb94cbb5ac03f35c
Author: Matt Turner mattst88 AT gentoo DOT org
AuthorDate: Sat Aug 22 19:38:47 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Aug 22 19:39:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=444b68b6

x11-libs/pixman: Remove unused inherited eclasses.

Package-Manager: portage-2.2.20.1

 x11-libs/pixman/pixman-0.33.2.ebuild | 2 +-
 x11-libs/pixman/pixman-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/pixman/pixman-0.33.2.ebuild 
b/x11-libs/pixman/pixman-0.33.2.ebuild
index 083ec14..dc3517f 100644
--- a/x11-libs/pixman/pixman-0.33.2.ebuild
+++ b/x11-libs/pixman/pixman-0.33.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs versionator
+inherit xorg-2
 
 EGIT_REPO_URI=git://anongit.freedesktop.org/git/pixman
 DESCRIPTION=Low-level pixel manipulation routines

diff --git a/x11-libs/pixman/pixman-.ebuild 
b/x11-libs/pixman/pixman-.ebuild
index 083ec14..dc3517f 100644
--- a/x11-libs/pixman/pixman-.ebuild
+++ b/x11-libs/pixman/pixman-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs versionator
+inherit xorg-2
 
 EGIT_REPO_URI=git://anongit.freedesktop.org/git/pixman
 DESCRIPTION=Low-level pixel manipulation routines



[gentoo-commits] repo/gentoo:master commit in: x11-libs/pixman/

2015-08-22 Thread Matt Turner
commit: a76b5be9d92a4ebb1f8f09d32a10753f2524890f
Author: Matt Turner mattst88 AT gentoo DOT org
AuthorDate: Sat Aug 22 19:35:44 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Aug 22 19:39:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a76b5be9

x11-libs/pixman: Add git ebuild.

Package-Manager: portage-2.2.20.1

 x11-libs/pixman/pixman-0.33.2.ebuild | 7 ++-
 x11-libs/pixman/{pixman-0.33.2.ebuild = pixman-.ebuild} | 7 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/x11-libs/pixman/pixman-0.33.2.ebuild 
b/x11-libs/pixman/pixman-0.33.2.ebuild
index 0b558b8..083ec14 100644
--- a/x11-libs/pixman/pixman-0.33.2.ebuild
+++ b/x11-libs/pixman/pixman-0.33.2.ebuild
@@ -9,7 +9,12 @@ inherit xorg-2 toolchain-funcs versionator
 EGIT_REPO_URI=git://anongit.freedesktop.org/git/pixman
 DESCRIPTION=Low-level pixel manipulation routines
 
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris ~x86-winnt
+if [[ $PV = * ]]; then
+   KEYWORDS=
+else
+   KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris ~x86-winnt
+fi
+
 IUSE=altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 
cpu_flags_x86_ssse3
 RDEPEND=abi_x86_32? (
!=app-emulation/emul-linux-x86-gtklibs-20131008

diff --git a/x11-libs/pixman/pixman-0.33.2.ebuild 
b/x11-libs/pixman/pixman-.ebuild
similarity index 73%
copy from x11-libs/pixman/pixman-0.33.2.ebuild
copy to x11-libs/pixman/pixman-.ebuild
index 0b558b8..083ec14 100644
--- a/x11-libs/pixman/pixman-0.33.2.ebuild
+++ b/x11-libs/pixman/pixman-.ebuild
@@ -9,7 +9,12 @@ inherit xorg-2 toolchain-funcs versionator
 EGIT_REPO_URI=git://anongit.freedesktop.org/git/pixman
 DESCRIPTION=Low-level pixel manipulation routines
 
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris ~x86-winnt
+if [[ $PV = * ]]; then
+   KEYWORDS=
+else
+   KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris ~x86-winnt
+fi
+
 IUSE=altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 
cpu_flags_x86_ssse3
 RDEPEND=abi_x86_32? (
!=app-emulation/emul-linux-x86-gtklibs-20131008



[gentoo-commits] repo/gentoo:master commit in: dev-util/bless/, dev-util/bless/files/

2015-08-22 Thread Mike Auty
commit: 4ef6927a0a6964ff3ea3fb3df864bb9b356687fb
Author: Mike Auty ikelos AT gentoo DOT org
AuthorDate: Sun Aug 23 00:44:11 2015 +
Commit: Mike Auty ikelos AT gentoo DOT org
CommitDate: Sun Aug 23 00:59:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef6927a

dev-util/bless: Update for monolithic gtk-sharp  mono-4

Changed the dependencies to cope with the unannounced
monolithic gtk-sharp ebuild which blocks on packages
such as bless that need glade-sharp.

Also introduced a patch to use mcs rather than the
depreacted gmcs.

Package-Manager: portage-2.2.20.1
Signed-off-by: Mike Auty ikelos AT gentoo.org

 dev-util/bless/bless-0.6.0-r2.ebuild  |  6 +++--
 dev-util/bless/files/bless-0.6.0-mono-4.patch | 36 +++
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/dev-util/bless/bless-0.6.0-r2.ebuild 
b/dev-util/bless/bless-0.6.0-r2.ebuild
index 47e9220..3f0a087 100644
--- a/dev-util/bless/bless-0.6.0-r2.ebuild
+++ b/dev-util/bless/bless-0.6.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,8 @@ IUSE=debug
 RDEPEND=
=dev-lang/mono-1.1.14
=dev-dotnet/gtk-sharp-2.12
-   =dev-dotnet/glade-sharp-2.12
+   || ( =dev-dotnet/gtk-sharp-2.12.21
+=dev-dotnet/glade-sharp-2.12 )
 
 DEPEND=${RDEPEND}
app-text/scrollkeeper
@@ -42,6 +43,7 @@ src_prepare() {
( ${T}/gettextize -f --no-changelog  /dev/null ) || die gettexize 
failed
epatch ${FILESDIR}/${P}-pixmap.patch
epatch ${FILESDIR}/${P}-docpath.patch
+   epatch ${FILESDIR}/${P}-mono-4.patch
eautoreconf
gnome2_src_prepare
 }

diff --git a/dev-util/bless/files/bless-0.6.0-mono-4.patch 
b/dev-util/bless/files/bless-0.6.0-mono-4.patch
new file mode 100644
index 000..92b1100
--- /dev/null
+++ b/dev-util/bless/files/bless-0.6.0-mono-4.patch
@@ -0,0 +1,36 @@
+diff --git a/builder/ModuleBuilder.cs b/builder/ModuleBuilder.cs
+index 0f62e92..7edb1ab 100644
+--- a/builder/ModuleBuilder.cs
 b/builder/ModuleBuilder.cs
+@@ -119,7 +119,7 @@ public class ModuleBuilder
+   //System.Console.WriteLine(gmcs {0}, sb.ToString());
+   System.Console.WriteLine( Building module {0}..., 
module.Name);
+ 
+-  Process buildProcess = Process.Start(gmcs, sb.ToString());
++  Process buildProcess = Process.Start(mcs, sb.ToString());
+   buildProcess.WaitForExit();
+ 
+   if (buildProcess.ExitCode == 0) {
+@@ -137,4 +137,4 @@ public class ModuleBuilder
+ }
+ 
+ 
+-}
+\ No newline at end of file
++}
+diff --git a/configure.ac b/configure.ac
+index 415cc64..a8e527c 100644
+--- a/configure.ac
 b/configure.ac
+@@ -24,9 +24,9 @@ if test x$PKG_CONFIG = xno; then
+ fi
+   
+ # C# compiler
+-AC_PATH_PROG(MCS, gmcs, no)
++AC_PATH_PROG(MCS, mcs, no)
+ 
+-CS=gmcs C#
++CS=mcs C#
+ if test x$MCS = xno  ; then
+   AC_MSG_ERROR([No $CS compiler found])
+ fi



[gentoo-commits] dev/ikelos:master commit in: app-backup/gibak/

2015-08-22 Thread Mike Auty
commit: 3ccbbc583905d6cb192a9e442d648cc92e6c7ba6
Author: layman layman AT localhost
AuthorDate: Sun Aug 23 01:36:08 2015 +
Commit: Mike Auty ikelos AT gentoo DOT org
CommitDate: Sun Aug 23 01:36:08 2015 +
URL:https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=3ccbbc58

Remove gibak, since it seems dead upstream.

 app-backup/gibak/Manifest   |  3 ---
 app-backup/gibak/gibak-0.3.0.ebuild | 31 ---
 app-backup/gibak/gibak-.ebuild  | 35 ---
 3 files changed, 69 deletions(-)

diff --git a/app-backup/gibak/Manifest b/app-backup/gibak/Manifest
deleted file mode 100644
index e611ef0..000
--- a/app-backup/gibak/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gibak-0.3.0.tar.gz 24380 RMD160 682c0801b30018c475ae5cc63c1854ee4fe0cec4 
SHA1 04c161fc42411d2909dc1790ad003543dd28b3d6 SHA256 
a270398ef509303af93f2945acf82c98d3479a3bbe70b907116859ced9855478
-EBUILD gibak-0.3.0.ebuild 699 RMD160 509a8fbe53e03356d023bfb882c2624a6310da38 
SHA1 fff3d9b8398e95caa046b07afdb25b569a0b667a SHA256 
22377f97d5609570b670d96586fb1a0f45eec3150461c4e0f2af014a1141bc9e
-EBUILD gibak-.ebuild 726 RMD160 d42feb6827ef36a1e1a397f5f1ecd859ed213930 
SHA1 e380d557fe1f4dc6cbf88a5fba32c8aff3630c38 SHA256 
d1302c2913a4868c102cb89986257dc70365d8c5eaa3f97ca6b89bb472846882

diff --git a/app-backup/gibak/gibak-0.3.0.ebuild 
b/app-backup/gibak/gibak-0.3.0.ebuild
deleted file mode 100644
index cae435d..000
--- a/app-backup/gibak/gibak-0.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION=A backup tool based on git.
-HOMEPAGE=http://eigenclass.org/hiki/gibak-backup-system-introduction/;
-SRC_URI=http://eigenclass.org/static/gibak/${P}.tar.gz;
-
-LICENSE=LGPL-2.1
-SLOT=0
-KEYWORDS=~x86 ~amd64
-IUSE=xattr
-
-DEPEND==dev-lang/ocaml-3.10
-   dev-util/omake
-RDEPEND==dev-vcs/git-1.5.4.2
-net-misc/rsync
-
-src_compile() {
-   use xattr  CFLAGS=${CFLAGS} -DHAVE_LINUX_XATTR
-   omake --force-dotomake --dotomake omc || die omake failed
-}
-
-src_install() {
-   dobin find-git-files
-   dobin find-git-repos
-   dobin gibak
-   dobin ometastore
-   dodoc README.txt
-}
-

diff --git a/app-backup/gibak/gibak-.ebuild 
b/app-backup/gibak/gibak-.ebuild
deleted file mode 100644
index ec3395c..000
--- a/app-backup/gibak/gibak-.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit git
-
-EGIT_REPO_URI=http://eigenclass.org/repos/git/gibak/.git;
-
-DESCRIPTION=A backup tool based on git.
-HOMEPAGE=http://eigenclass.org/hiki/gibak-backup-system-introduction/;
-SRC_URI=
-
-LICENSE=LGPL-2.1
-SLOT=0
-KEYWORDS=~x86 ~amd64
-IUSE=xattr
-
-DEPEND==dev-lang/ocaml-3.10
-   dev-util/omake
-RDEPEND==dev-vcs/git-1.5.4.2
-net-misc/rsync
-
-src_compile() {
-   use xattr  CFLAGS=${CFLAGS} -DHAVE_LINUX_XATTR
-   omake --force-dotomake --dotomake omc || die omake failed
-}
-
-src_install() {
-   dobin find-git-files
-   dobin find-git-repos
-   dobin gibak
-   dobin ometastore
-   dodoc README.txt
-}
-



[gentoo-commits] dev/ikelos:master commit in: net-analyzer/bro/, net-analyzer/bro/files/

2015-08-22 Thread Mike Auty
commit: 67f12402b4893e8c28a16a650a8e199bdd1bf1a8
Author: layman layman AT localhost
AuthorDate: Sun Aug 23 01:52:04 2015 +
Commit: Mike Auty ikelos AT gentoo DOT org
CommitDate: Sun Aug 23 01:52:04 2015 +
URL:https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=67f12402

Removed old bro ebuild, check the pentoo repository for a more recent version.

 net-analyzer/bro/Manifest  |  5 --
 net-analyzer/bro/bro-2.0.ebuild| 67 ---
 net-analyzer/bro/files/bro-config-root.patch   | 26 --
 .../bro/files/bro-installpackageconfig.patch   | 94 --
 net-analyzer/bro/files/bro-userchanged.patch   | 91 -
 5 files changed, 283 deletions(-)

diff --git a/net-analyzer/bro/Manifest b/net-analyzer/bro/Manifest
deleted file mode 100644
index 466ba08..000
--- a/net-analyzer/bro/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX bro-config-root.patch 1259 SHA256 
9835baf4979e871adfed779d49e8158a20a6e8ecf20c0c2434658190fc5159e9 SHA512 
a8b173e4d65ef9610e65256ed79fc1ac4593a9994ea43e7ea8c24403354f6dd65c1137a890c2f925daf0d4865951250f3b7cfbec971dfd1867521ce0f703d49b
 WHIRLPOOL 
a5255dbe48910f65eba27490d9ce803daa1923abe584906c2b4a8b12bbe102f651156e4d74239ab7ebfa93075c409c66ab3472ebd7087016d51ceba13d9fdca3
-AUX bro-installpackageconfig.patch 3516 SHA256 
e9a94b06200ea29a8d8aded24ed79003eab79f443d696e32dda5ffcd433f2db4 SHA512 
5f08a9a7b56c37e67c404a63cb03edf2acfae3cc1b4f5eb855b931cf2bb195f834b87863886919623b3ce324fb8e63261c917c450a30d25d155efa6a54a7d73b
 WHIRLPOOL 
ec8d59e1cae1d47ae7a2223582a845b8f40797e7e1f8101d3651e35280c4d0d532c89018fc68874c821eb9db8e8911436e1de1d6d3bed02576abe8c59c1abc19
-AUX bro-userchanged.patch 3371 SHA256 
d6c88b218cb77dc89410ff08648d18ee157d28be4b75b65176f7cb06bd4b389a SHA512 
f0139af55ee1d05a36aa3827ecfb3f04be4041b0c0d5be6a5f0cf706a6f6542f9c994c49fc758a7d544276e67243606ed7dc4a8632194e93d8d4735ccbd44fd5
 WHIRLPOOL 
4bbb938bdf066ffc58684550a69306e0b6d986b30c6d59bcfafbcc35fca85443686aa8a323748bb4acc031c97f4a6a1855cc5cb04285c1417228a1dcf1a6c1e0
-DIST bro-2.0.tar.gz 3652838 SHA256 
52df8fd777516761b4c9754ef587f326f6c2efcc8958a440cae9f9de92501947 SHA512 
d01c39dc716190dc67f57b2ca5833c4fe7f53ec9b912061c8d3ab7d334f10a2172524a1670086b8b6e514e7a0e43a96541a304c0117569b93ac9f72b06ea6e60
 WHIRLPOOL 
7f45446fe0151d6572f99115f43675ffde74e635e14513684c3b46eeb364d84a5a9ee91f9406df14cc79001a07efdadd19c200ca70bef043e9f301ef7ecbe333
-EBUILD bro-2.0.ebuild 1815 SHA256 
2fb3ecdd4277543076d80627d68a0b50a9413887f3c7dd903704bdcc8a4fa25c SHA512 
92c92a46afa7034e579fed9d2d8128fec84c87c5a1e5d1bae0076bdac576f42d67a02e7928119e4361cff8614ef1afaeb517147757056d7a00f0876469d2d446
 WHIRLPOOL 
f3fd1b034b6f193732c270001b6089bf40a22755e69c49f67b9371ba309a81829f74a4f7fe901f93e5d18fcef82fe22d6d026b0d52771e5b673a59eb6537ecee

diff --git a/net-analyzer/bro/bro-2.0.ebuild b/net-analyzer/bro/bro-2.0.ebuild
deleted file mode 100644
index afa8f11..000
--- a/net-analyzer/bro/bro-2.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit cmake-utils
-
-DESCRIPTION=An advanced intrusion detection system
-HOMEPAGE=http://bro-ids.org/;
-SRC_URI=http://www.bro-ids.org/downloads/release/${P}.tar.gz;
-
-LICENSE=BSD
-SLOT=0
-KEYWORDS=~amd64
-IUSE=debug perftools +geoip +broctl +broaux +broccoli
-
-DEPEND=dev-libs/geoip
-   dev-libs/openssl
-   sys-apps/file
-   sys-libs/zlib
-   net-libs/libpcap
-   dev-lang/swig
-   app-shells/bash
-   geoip? ( dev-libs/geoip )
-   perftools? ( dev-util/google-perftools )
-RDEPEND=$DEPEND
-
-src_prepare() {
-   epatch ${FILESDIR}/bro-config-root.patch
-   epatch ${FILESDIR}/bro-userchanged.patch
-   epatch ${FILESDIR}/bro-installpackageconfig.patch
-}
-
-src_configure() {
-mycmakeargs=(
-$(cmake-utils_use geoip USE_GEOIP)
-$(cmake-utils_use perftools USE_PERFTOOLS)
-$(cmake-utils_use broctl INSTALL_BROCTL)
-$(cmake-utils_use broaux INSTALL_AUX_TOOLS)
-$(cmake-utils_use broccoli INSTALL_BROCCOLI)
-)
-
-   mylibchanges=aux/broccoli/src
- aux/binpac/lib
- aux/broctl
- aux/broccoli/bindings/broccoli-ruby
- aux/broccoli/bindings/broccoli-python
- aux/broctl/aux/pysubnettree
-
-for i in ${mylibchanges};
-do
-   einfo Apply sed changes to ${i}
-sed -e 
s#{CMAKE_INSTALL_PREFIX}/lib/#{CMAKE_INSTALL_PREFIX}/$(get_libdir)/# \
-   -e s#PY_MOD_INSTALL_DIR lib/#PY_MOD_INSTALL_DIR 
$(get_libdir)/# \
-   -e s#DESTINATION lib#DESTINATION $(get_libdir)# \
--i ${i}/CMakeLists.txt
-done
-
-   

[gentoo-commits] dev/ikelos:master commit in: net-analyzer/inetsim/

2015-08-22 Thread Mike Auty
commit: 51a9faef48ce7985fa535626011fc27a4e634ac0
Author: layman layman AT localhost
AuthorDate: Sun Aug 23 01:50:53 2015 +
Commit: Mike Auty ikelos AT gentoo DOT org
CommitDate: Sun Aug 23 01:50:53 2015 +
URL:https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=51a9faef

Bump inetsim.

 net-analyzer/inetsim/Manifest   | 4 ++--
 net-analyzer/inetsim/{inetsim-1.2.4.ebuild = inetsim-1.2.5.ebuild} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/inetsim/Manifest b/net-analyzer/inetsim/Manifest
index 58b06c4..07b8b36 100644
--- a/net-analyzer/inetsim/Manifest
+++ b/net-analyzer/inetsim/Manifest
@@ -1,2 +1,2 @@
-DIST inetsim-1.2.4.tar.gz 299700 SHA256 
f58f490d02baa42c4cf03f804a298d3c6ebcf821e663c638802ee25a34113aab SHA512 
de0729694dc44302bdda0a60341ecd7152816ccfb2755e3e86e241969552ceb28a0a7310512f42145b84c599abc76d5f18aa8adf35805a4b968f159226999a1b
 WHIRLPOOL 
e0bae0e307eb4deb8fade0625d6347be5eee963b9760ac533c8ebaa4e40a3c0ab112eb941091a196299518a0b24030ed4ed3f8e4d87ffec5f1262ed307be5348
-EBUILD inetsim-1.2.4.ebuild 697 SHA256 
d20d66d12a1972d53c8b33e24120aab61e4625744ee7c26d5de64e9e9d3ad27d SHA512 
39319cc59bd323778f1c7a1a1954dff49058e8031d04bec2f2ce7f5403dfe9c8b6ae8d31a3736aa8af79fb6d809951660c42b3b22bad1e326992ea1714ffa2ba
 WHIRLPOOL 
7abed2b7ec2e74b95c7b91c5c61426b8ca5f92519f0faea48262a1d5475bdf3d7bdd8024b3668cc8f555adba84d102bc1eb76a54c3e65d20f73e0c802e7ef5b0
+DIST inetsim-1.2.5.tar.gz 299963 SHA256 
53871f29f1647b6870fa9f769c79186d40645a35560338ea79e8507d407a54e0 SHA512 
f30b688b7f665ce342a4d792a473c23f9b22839e74425b267fd056aefddf0cde9027450a95748a0fe58fa736374f57cfd72374a04ad1901c128466cfb2fc048d
 WHIRLPOOL 
cc94d42158cc2a6b2cbed0d99518f66eef56a441260526f32e47f93ad135c7cc529a5fdbbc6a0f344de80d49041a87979868cfe365251a60a3c38910f7525127
+EBUILD inetsim-1.2.5.ebuild 797 SHA256 
1b7436381bf13e1b43b311d4516c5e8c50bcf212672eb826ce6c0bfc36432205 SHA512 
0341e5d78019d2a3759de6d1e1f8e6009841d5346fed212af82dd9acde0aba3de610422918962f718f7bd89670f19f50d3d314ac528019fd36f0ed12d9f89f65
 WHIRLPOOL 
e66bf8de062e8189579048066e7a5798dc319bad0cd57856b7e1d14065f28c52f51e49ff0b842c326841c7d39ac47204d2f8aa59a1872d79d7bec526d6bca529

diff --git a/net-analyzer/inetsim/inetsim-1.2.4.ebuild 
b/net-analyzer/inetsim/inetsim-1.2.5.ebuild
similarity index 84%
rename from net-analyzer/inetsim/inetsim-1.2.4.ebuild
rename to net-analyzer/inetsim/inetsim-1.2.5.ebuild
index b9acbc0..8b5cb6e 100644
--- a/net-analyzer/inetsim/inetsim-1.2.4.ebuild
+++ b/net-analyzer/inetsim/inetsim-1.2.5.ebuild
@@ -6,8 +6,8 @@ EAPI=5
 
 inherit user
 
-DESCRIPTION=
-HOMEPAGE=
+DESCRIPTION=Tool for simulating an entire internet with working services on a 
single box.
+HOMEPAGE=http://www.inetsim.org/;
 SRC_URI=http://www.inetsim.org/downloads/${P}.tar.gz;
 
 LICENSE=



[gentoo-commits] repo/gentoo:master commit in: /

2015-08-22 Thread Mike Gilbert
commit: ecfefda85d3f94c3c9dfe6496e1cb6f5bc801da2
Author: Mike Gilbert floppym AT gentoo DOT org
AuthorDate: Sun Aug 23 02:58:13 2015 +
Commit: Mike Gilbert floppym AT gentoo DOT org
CommitDate: Sun Aug 23 03:08:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecfefda8

Merge pull 34: Don't install cffi for PyPy

Pull-Request: #34

 dev-python/bcrypt/bcrypt-2.0.0.ebuild   | 2 ++
 dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild  | 3 ++-
 dev-python/cairocffi/cairocffi-0.5.4.ebuild | 3 ++-
 dev-python/cairocffi/cairocffi-0.6-r1.ebuild| 2 +-
 dev-python/cairocffi/cairocffi-0.6.ebuild   | 2 +-
 dev-python/cairocffi/cairocffi-0.7.1.ebuild | 8 +---
 dev-python/cairocffi/cairocffi-0.7.2.ebuild | 8 +---
 dev-python/cffi/cffi-0.8.6.ebuild   | 2 +-
 dev-python/cffi/cffi-1.1.2.ebuild   | 2 +-
 dev-python/cffi/cffi-1.2.1.ebuild   | 2 +-
 dev-python/cryptography/cryptography-1.0.ebuild | 3 ++-
 dev-python/xcffib/xcffib-0.1.10.ebuild  | 2 +-
 dev-python/xcffib/xcffib-0.2.0.ebuild   | 2 +-
 dev-python/xcffib/xcffib-0.2.1.ebuild   | 2 +-
 dev-python/xcffib/xcffib-0.2.5.ebuild   | 5 +++--
 dev-python/xcffib/xcffib-0.3.2.ebuild   | 3 ++-
 dev-python/xcffib/xcffib-0.3.4.ebuild   | 3 ++-
 17 files changed, 33 insertions(+), 21 deletions(-)



[gentoo-commits] repo/gentoo:master commit in: profiles/

2015-08-22 Thread Matt Turner
commit: f2b7352915ebc63b4a55a5511f56430f88b8bfea
Author: Matt Turner mattst88 AT gentoo DOT org
AuthorDate: Sun Aug 23 03:10:52 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Aug 23 03:11:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2b73529

profiles/package.mask: Mask x11-base/nouveau-drm for removal.

 profiles/package.mask | 5 +
 1 file changed, 5 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index b6f5f8d..f27eb87 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner matts...@gentoo.org (22 Aug 2015)
+# nouveau has been in the kernel since 2.6.33
+# Masked for removal in 30 days.
+x11-base/nouveau-drm
+
 # Lars Wendler polynomia...@gentoo.org (21 Aug 2015)
 # This version breaks tests in app-admin/rsyslog and 
 # also breaks rule settings.



[gentoo-commits] repo/gentoo:master commit in: dev-python/cffi/

2015-08-22 Thread Mike Gilbert
commit: f2867a63e62ec1421b54deb72e2e5ce9d23dccae
Author: Sean Vig sean.v.775 AT gmail DOT com
AuthorDate: Sat Aug 22 18:51:39 2015 +
Commit: Mike Gilbert floppym AT gentoo DOT org
CommitDate: Sun Aug 23 02:42:00 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2867a63

dev-python/cffi: Remove pypy from PYTHON_TARGETS

pypy comes with cffi built-in, we should not build cffi for pypy

 dev-python/cffi/cffi-0.8.6.ebuild | 2 +-
 dev-python/cffi/cffi-1.1.2.ebuild | 2 +-
 dev-python/cffi/cffi-1.2.1.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-python/cffi/cffi-0.8.6.ebuild 
b/dev-python/cffi/cffi-0.8.6.ebuild
index e7446c7..a7862a6 100644
--- a/dev-python/cffi/cffi-0.8.6.ebuild
+++ b/dev-python/cffi/cffi-0.8.6.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1
 

diff --git a/dev-python/cffi/cffi-1.1.2.ebuild 
b/dev-python/cffi/cffi-1.1.2.ebuild
index 102dde7..23b82d8 100644
--- a/dev-python/cffi/cffi-1.1.2.ebuild
+++ b/dev-python/cffi/cffi-1.1.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1
 

diff --git a/dev-python/cffi/cffi-1.2.1.ebuild 
b/dev-python/cffi/cffi-1.2.1.ebuild
index 4d1ec48..c39d04a 100644
--- a/dev-python/cffi/cffi-1.2.1.ebuild
+++ b/dev-python/cffi/cffi-1.2.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/bcrypt/

2015-08-22 Thread Mike Gilbert
commit: d1473b547540ba47c235c9f4841a8c85d6918276
Author: Sean Vig sean.v.775 AT gmail DOT com
AuthorDate: Sat Aug 22 19:10:42 2015 +
Commit: Mike Gilbert floppym AT gentoo DOT org
CommitDate: Sat Aug 22 23:48:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1473b54

dev-python/bcrypt: Ensure new enough pypy installed

 dev-python/bcrypt/bcrypt-2.0.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-python/bcrypt/bcrypt-2.0.0.ebuild 
b/dev-python/bcrypt/bcrypt-2.0.0.ebuild
index 28ee0ee..a10d7df 100644
--- a/dev-python/bcrypt/bcrypt-2.0.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-2.0.0.ebuild
@@ -23,9 +23,11 @@ IUSE=
 DEPEND=
dev-python/setuptools[${PYTHON_USEDEP}]
$(python_gen_cond_dep '=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 
'python*')
+   $(python_gen_cond_dep '=virtual/pypy-2.6.0' pypy )

 RDEPEND=
$(python_gen_cond_dep '=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 
'python*')
+   $(python_gen_cond_dep '=virtual/pypy-2.6.0' pypy )
=dev-python/six-1.4.1[${PYTHON_USEDEP}]
!dev-python/py-bcrypt
 



[gentoo-commits] repo/gentoo:master commit in: dev-python/xcffib/

2015-08-22 Thread Mike Gilbert
commit: 9d591e040ad1c2683524f18b7131be3a1c670608
Author: Sean Vig sean.v.775 AT gmail DOT com
AuthorDate: Sat Aug 22 23:21:42 2015 +
Commit: Mike Gilbert floppym AT gentoo DOT org
CommitDate: Sun Aug 23 02:41:59 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d591e04

dev-python/xcffib: Don't enable pypy Python target on dev-python/cffi

 dev-python/xcffib/xcffib-0.1.10.ebuild | 2 +-
 dev-python/xcffib/xcffib-0.2.0.ebuild  | 2 +-
 dev-python/xcffib/xcffib-0.2.1.ebuild  | 2 +-
 dev-python/xcffib/xcffib-0.2.5.ebuild  | 5 +++--
 dev-python/xcffib/xcffib-0.3.2.ebuild  | 3 ++-
 dev-python/xcffib/xcffib-0.3.4.ebuild  | 3 ++-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/dev-python/xcffib/xcffib-0.1.10.ebuild 
b/dev-python/xcffib/xcffib-0.1.10.ebuild
index 481f7ea..13222ea 100644
--- a/dev-python/xcffib/xcffib-0.1.10.ebuild
+++ b/dev-python/xcffib/xcffib-0.1.10.ebuild
@@ -19,7 +19,7 @@ IUSE=
 COMMON_DEPEND=x11-libs/libxcb
 
 RDEPEND=
-   =dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '=dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]' 
'python*')
dev-python/six[${PYTHON_USEDEP}]
${COMMON_DEPEND}
 DEPEND=

diff --git a/dev-python/xcffib/xcffib-0.2.0.ebuild 
b/dev-python/xcffib/xcffib-0.2.0.ebuild
index 1b041db..621063b 100644
--- a/dev-python/xcffib/xcffib-0.2.0.ebuild
+++ b/dev-python/xcffib/xcffib-0.2.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS=~amd64 ~x86
 COMMON_DEPEND=x11-libs/libxcb
 
 RDEPEND=
-   =dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '=dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]' 
'python*')
dev-python/six[${PYTHON_USEDEP}]
${COMMON_DEPEND}
 DEPEND=

diff --git a/dev-python/xcffib/xcffib-0.2.1.ebuild 
b/dev-python/xcffib/xcffib-0.2.1.ebuild
index 1b041db..621063b 100644
--- a/dev-python/xcffib/xcffib-0.2.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.2.1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS=~amd64 ~x86
 COMMON_DEPEND=x11-libs/libxcb
 
 RDEPEND=
-   =dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '=dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]' 
'python*')
dev-python/six[${PYTHON_USEDEP}]
${COMMON_DEPEND}
 DEPEND=

diff --git a/dev-python/xcffib/xcffib-0.2.5.ebuild 
b/dev-python/xcffib/xcffib-0.2.5.ebuild
index 86b41e4..9052d50 100644
--- a/dev-python/xcffib/xcffib-0.2.5.ebuild
+++ b/dev-python/xcffib/xcffib-0.2.5.ebuild
@@ -20,8 +20,9 @@ IUSE=test
 COMMON_DEPEND=x11-libs/libxcb
 
 RDEPEND=
-   =dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]
-   dev-python/cffi-1:=[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '=dev-python/cffi-0.8.2:=[${PYTHON_USEDEP}]' 
'python*')
+   $(python_gen_cond_dep 'dev-python/cffi-1:=[${PYTHON_USEDEP}]' 
'python*')
+   $(python_gen_cond_dep 'virtual/pypy-2.6.0' pypy )
dev-python/six[${PYTHON_USEDEP}]
${COMMON_DEPEND}
 DEPEND=

diff --git a/dev-python/xcffib/xcffib-0.3.2.ebuild 
b/dev-python/xcffib/xcffib-0.3.2.ebuild
index 03452f1..cece942 100644
--- a/dev-python/xcffib/xcffib-0.3.2.ebuild
+++ b/dev-python/xcffib/xcffib-0.3.2.ebuild
@@ -20,7 +20,8 @@ IUSE=test
 COMMON_DEPEND=x11-libs/libxcb
 
 RDEPEND=
-   =dev-python/cffi-0.1.1:=[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 
'python*')
+   $(python_gen_cond_dep '=virtual/pypy-2.6.0' pypy )
dev-python/six[${PYTHON_USEDEP}]
${COMMON_DEPEND}
 DEPEND=

diff --git a/dev-python/xcffib/xcffib-0.3.4.ebuild 
b/dev-python/xcffib/xcffib-0.3.4.ebuild
index 03452f1..cece942 100644
--- a/dev-python/xcffib/xcffib-0.3.4.ebuild
+++ b/dev-python/xcffib/xcffib-0.3.4.ebuild
@@ -20,7 +20,8 @@ IUSE=test
 COMMON_DEPEND=x11-libs/libxcb
 
 RDEPEND=
-   =dev-python/cffi-0.1.1:=[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 
'python*')
+   $(python_gen_cond_dep '=virtual/pypy-2.6.0' pypy )
dev-python/six[${PYTHON_USEDEP}]
${COMMON_DEPEND}
 DEPEND=



[gentoo-commits] repo/gentoo:master commit in: dev-python/cffi/

2015-08-22 Thread Mike Gilbert
commit: e0697d1cb2dc60d40dcfa5bb72ef00a131a6d054
Author: Mike Gilbert floppym AT gentoo DOT org
AuthorDate: Sun Aug 23 03:08:26 2015 +
Commit: Mike Gilbert floppym AT gentoo DOT org
CommitDate: Sun Aug 23 03:08:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0697d1c

dev-python/cffi: Add warning about pypy

Package-Manager: portage-2.2.20_p134

 dev-python/cffi/cffi-1.2.1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-python/cffi/cffi-1.2.1.ebuild 
b/dev-python/cffi/cffi-1.2.1.ebuild
index c39d04a..8d5fda8 100644
--- a/dev-python/cffi/cffi-1.2.1.ebuild
+++ b/dev-python/cffi/cffi-1.2.1.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1



[gentoo-commits] repo/gentoo:master commit in: dev-python/cryptography/

2015-08-22 Thread Mike Gilbert
commit: 3a51d23efaa263cb0198c04b01b1a25a4ff72808
Author: Sean Vig sean.v.775 AT gmail DOT com
AuthorDate: Sat Aug 22 23:12:57 2015 +
Commit: Mike Gilbert floppym AT gentoo DOT org
CommitDate: Sun Aug 23 02:41:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a51d23e

dev-python/cryptography: Enable pypy as Python target

 dev-python/cryptography/cryptography-1.0.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-python/cryptography/cryptography-1.0.ebuild 
b/dev-python/cryptography/cryptography-1.0.ebuild
index c06bcfd..8975371 100644
--- a/dev-python/cryptography/cryptography-1.0.ebuild
+++ b/dev-python/cryptography/cryptography-1.0.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 # only works with =pypy-2.6
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
 
 inherit distutils-r1
 
@@ -27,6 +27,7 @@ RDEPEND=
=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '=virtual/pypy-2.6.0' pypy )

 DEPEND=${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: dev-python/cairocffi/

2015-08-22 Thread Mike Gilbert
commit: 0e23f54cd2fded0aca4aad1ea475f74f313ad267
Author: Sean Vig sean.v.775 AT gmail DOT com
AuthorDate: Sat Aug 22 23:10:58 2015 +
Commit: Mike Gilbert floppym AT gentoo DOT org
CommitDate: Sun Aug 23 02:41:57 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e23f54c

dev-python/cairocffi: Don't enable pypy Python target on dev-python/cffi

Also, check that new enough (=2.6.0) PyPy installed to ensure correct
cffi version.

 dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild | 3 ++-
 dev-python/cairocffi/cairocffi-0.5.4.ebuild| 3 ++-
 dev-python/cairocffi/cairocffi-0.6-r1.ebuild   | 2 +-
 dev-python/cairocffi/cairocffi-0.6.ebuild  | 2 +-
 dev-python/cairocffi/cairocffi-0.7.1.ebuild| 8 +---
 dev-python/cairocffi/cairocffi-0.7.2.ebuild| 8 +---
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild 
b/dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild
index 02d50b7..b09276c 100644
--- a/dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.5.3-r1.ebuild
@@ -18,7 +18,8 @@ SLOT=0
 KEYWORDS=~amd64 ~x86
 IUSE=doc test
 
-RDEPEND==dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+RDEPEND=
+   $(python_gen_cond_dep '=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]' 
'python*')
x11-libs/cairo:0=
 DEPEND=dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )

diff --git a/dev-python/cairocffi/cairocffi-0.5.4.ebuild 
b/dev-python/cairocffi/cairocffi-0.5.4.ebuild
index 02d50b7..b09276c 100644
--- a/dev-python/cairocffi/cairocffi-0.5.4.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.5.4.ebuild
@@ -18,7 +18,8 @@ SLOT=0
 KEYWORDS=~amd64 ~x86
 IUSE=doc test
 
-RDEPEND==dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+RDEPEND=
+   $(python_gen_cond_dep '=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]' 
'python*')
x11-libs/cairo:0=
 DEPEND=dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )

diff --git a/dev-python/cairocffi/cairocffi-0.6-r1.ebuild 
b/dev-python/cairocffi/cairocffi-0.6-r1.ebuild
index b760032..77ff6bf 100644
--- a/dev-python/cairocffi/cairocffi-0.6-r1.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.6-r1.ebuild
@@ -21,7 +21,7 @@ IUSE=doc test
 
 # xcffib is an optional extra excpet that the testsuite has it a hard coded 
unconditional component
 RDEPEND=
-   =dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]' 
'python*')
x11-libs/cairo:0=
dev-python/xcffib-0.3[${PYTHON_USEDEP}]
x11-libs/gdk-pixbuf[jpeg]

diff --git a/dev-python/cairocffi/cairocffi-0.6.ebuild 
b/dev-python/cairocffi/cairocffi-0.6.ebuild
index b2428f7..bf66655 100644
--- a/dev-python/cairocffi/cairocffi-0.6.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.6.ebuild
@@ -21,7 +21,7 @@ IUSE=doc test
 
 # xcffib is an optional extra excpet that the testsuite has it a hard coded 
unconditional component
 RDEPEND=
-   =dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]' 
'python*')
x11-libs/cairo:0=
dev-python/xcffib-0.3[${PYTHON_USEDEP}]
 

diff --git a/dev-python/cairocffi/cairocffi-0.7.1.ebuild 
b/dev-python/cairocffi/cairocffi-0.7.1.ebuild
index c101a39..257de33 100644
--- a/dev-python/cairocffi/cairocffi-0.7.1.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.7.1.ebuild
@@ -21,10 +21,11 @@ KEYWORDS=~amd64 ~x86
 IUSE=doc test
 
 RDEPEND=
-   =dev-python/cffi-1.1.0:=[$(python_gen_usedep 'python*')]
+   $(python_gen_cond_dep '=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 
'python*')
=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
x11-libs/cairo:0=
-   x11-libs/gdk-pixbuf[jpeg]
+   x11-libs/gdk-pixbuf[jpeg]
+   $(python_gen_cond_dep '=virtual/pypy-2.6.0' pypy )
 
 DEPEND=
dev-python/setuptools[${PYTHON_USEDEP}]
@@ -32,7 +33,8 @@ DEPEND=
test? (
${RDEPEND}
dev-python/pytest[${PYTHON_USEDEP}]
-   )
+   )
+   $(python_gen_cond_dep '=virtual/pypy-2.6.0' pypy )
 
 PATCHES=(
# Intersphinx cause the usual d'loading of objects.inv from TWO online 
sites

diff --git a/dev-python/cairocffi/cairocffi-0.7.2.ebuild 
b/dev-python/cairocffi/cairocffi-0.7.2.ebuild
index 8aa7b95..b9396d0 100644
--- a/dev-python/cairocffi/cairocffi-0.7.2.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.7.2.ebuild
@@ -21,10 +21,11 @@ KEYWORDS=~amd64 ~x86
 IUSE=doc test
 
 RDEPEND=
-   =dev-python/cffi-1.1.0:=[$(python_gen_usedep 'python*')]
+   $(python_gen_cond_dep '=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 
'python*')
=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
x11-libs/cairo:0=
-   x11-libs/gdk-pixbuf[jpeg]
+   x11-libs/gdk-pixbuf[jpeg]
+   $(python_gen_cond_dep '=virtual/pypy-2.6.0' pypy )
 
 DEPEND=
dev-python/setuptools[${PYTHON_USEDEP}]
@@ -32,7 +33,8 @@ DEPEND=
 

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/, profiles/, media-libs/mesa/files/

2015-08-22 Thread Matt Turner
commit: 7481dcac7f35e8f5cdb92ca0dbf03bf6fab5e801
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sun Aug 23 03:34:34 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Aug 23 03:34:34 2015 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=7481dcac

media-libs/mesa: Delete (moved to main tree).

 media-libs/mesa/files/eselect-mesa.conf.9.2|  39 --
 media-libs/mesa/files/glx_ro_text_segm.patch   |  28 --
 .../mesa-9.2-dont-require-llvm-for-r300.patch  |  12 -
 .../mesa--dont-require-llvm-for-r300.patch |  11 -
 media-libs/mesa/mesa-.ebuild   | 456 -
 media-libs/mesa/metadata.xml   |  27 --
 profiles/package.mask  |   1 -
 7 files changed, 574 deletions(-)

diff --git a/media-libs/mesa/files/eselect-mesa.conf.9.2 
b/media-libs/mesa/files/eselect-mesa.conf.9.2
deleted file mode 100644
index ff590f5..000
--- a/media-libs/mesa/files/eselect-mesa.conf.9.2
+++ /dev/null
@@ -1,39 +0,0 @@
-# mesa classic/gallium implementations in this release
-
-# Syntax description:
-# * MESA_IMPLEMENTATIONS contains a space-delimited list of switchable
-#   classic/gallium implementations.
-# * MESA_DRIVERS is an associative array, for each member foo of
-#   MESA_IMPLEMENTATIONS it contains the following elements:
-#   foo,description - Human-readable description of the driver
-#   foo,classicdriver - Filename of the classic driver
-#   foo,galliumdriver - Filename of the gallium driver
-#   foo,default - which of classic or gallium is chosen by default
-
-MESA_IMPLEMENTATIONS=i915 i965 r300 r600 sw
-declare -A MESA_DRIVERS || die MESA_DRIVERS already in environment and not 
associative.
-
-MESA_DRIVERS[i915,description]=i915 (Intel 915, 945)
-MESA_DRIVERS[i915,classicdriver]=i915_dri.so
-MESA_DRIVERS[i915,galliumdriver]=i915g_dri.so
-MESA_DRIVERS[i915,default]=gallium
-
-MESA_DRIVERS[i965,description]=i965 (Intel GMA 965, G/Q3x, G/Q4x, HD)
-MESA_DRIVERS[i965,classicdriver]=i965_dri.so
-MESA_DRIVERS[i965,galliumdriver]=ilo_dri.so
-MESA_DRIVERS[i965,default]=classic
-
-MESA_DRIVERS[r300,description]=r300 (Radeon R300-R500)
-MESA_DRIVERS[r300,classicdriver]=r300_dri.so
-MESA_DRIVERS[r300,galliumdriver]=r300g_dri.so
-MESA_DRIVERS[r300,default]=gallium
-
-MESA_DRIVERS[r600,description]=r600 (Radeon R600-R700, Evergreen, Northern 
Islands)
-MESA_DRIVERS[r600,classicdriver]=r600_dri.so
-MESA_DRIVERS[r600,galliumdriver]=r600g_dri.so
-MESA_DRIVERS[r600,default]=gallium
-
-MESA_DRIVERS[sw,description]=sw (Software renderer)
-MESA_DRIVERS[sw,classicdriver]=swrast_dri.so
-MESA_DRIVERS[sw,galliumdriver]=swrastg_dri.so
-MESA_DRIVERS[sw,default]=gallium

diff --git a/media-libs/mesa/files/glx_ro_text_segm.patch 
b/media-libs/mesa/files/glx_ro_text_segm.patch
deleted file mode 100644
index 495b7dc..000
--- a/media-libs/mesa/files/glx_ro_text_segm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-2011-02-09 Jeremy Huddleston jerem...@freedesktop.org
-
-   #240956
-   * configure.ac  add support to enable readonly test segment on x86
-
 configure.ac.orig  2008-11-17 23:19:38.0 +0100
-+++ configure.ac   2008-11-17 23:20:17.0 +0100
-@@ -499,6 +499,20 @@
- enable_xcb=no
- fi
- 
-+
-+dnl readonly text segment on x86 hardened platforms
-+AC_ARG_ENABLE([glx_rts],
-+[AS_HELP_STRING([--enable-glx-rts],
-+[on x86, use a readonly text segment for libGL 
@:@default=disabled@:@])],
-+[enable_glx_rts=$enableval],
-+[enable_glx_rts=no])
-+if test x$enable_glx_rts = xyes; then
-+DEFINES=$DEFINES -DGLX_X86_READONLY_TEXT
-+else
-+enable_glx_rts=no
-+fi
-+
-+
- dnl
- dnl libGL configuration per driver
- dnl

diff --git a/media-libs/mesa/files/mesa-9.2-dont-require-llvm-for-r300.patch 
b/media-libs/mesa/files/mesa-9.2-dont-require-llvm-for-r300.patch
deleted file mode 100644
index bd24787..000
--- a/media-libs/mesa/files/mesa-9.2-dont-require-llvm-for-r300.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 21a1986..94b2247 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -1777,7 +1777,6 @@ if test x$with_gallium_drivers != x; then
- xr300)
- HAVE_GALLIUM_R300=yes
- PKG_CHECK_MODULES([RADEON], [libdrm_radeon = 
$LIBDRM_RADEON_REQUIRED])
--gallium_require_llvm Gallium R300
- GALLIUM_DRIVERS_DIRS=$GALLIUM_DRIVERS_DIRS r300
- gallium_check_st radeon/drm dri-r300   xvmc-r300 
vdpau-r300
- ;;

diff --git a/media-libs/mesa/files/mesa--dont-require-llvm-for-r300.patch 
b/media-libs/mesa/files/mesa--dont-require-llvm-for-r300.patch
deleted file mode 100644
index a85a3c1..000
--- a/media-libs/mesa/files/mesa--dont-require-llvm-for-r300.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
 a/configure.ac 2014-03-03 04:05:33.110522943 +0100
-+++ b/configure.ac 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/spice-vdagent/

2015-08-22 Thread Matthias Maier
commit: 024f47dd77aeb73c7f756e72a62da748dde17309
Author: Matthias Maier tamiko AT gentoo DOT org
AuthorDate: Sat Aug 22 19:25:21 2015 +
Commit: Matthias Maier tamiko AT gentoo DOT org
CommitDate: Sat Aug 22 19:25:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=024f47dd

app-emulation/spice-vdagent: install unit file with USE=systemd (bug #557954)

Fix a typo that prevented installation of the systemd unit file in case of
USE=systemd

Bug: 557954

Package-Manager: portage-2.2.20.1

 app-emulation/spice-vdagent/spice-vdagent-0.16.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.16.0.ebuild 
b/app-emulation/spice-vdagent/spice-vdagent-0.16.0.ebuild
index b652156..932365f 100644
--- a/app-emulation/spice-vdagent/spice-vdagent-0.16.0.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.16.0.ebuild
@@ -36,8 +36,8 @@ ERROR_VIRTIO_CONSOLE=VirtIO console/serial device support is 
required
 src_configure() {
local opt=--with-session-info=none --with-init-script=systemd
 
-   use systemd  opt=--with-session-info=systemd
-   use consolekit  opt=${opt} --with-session-info=console-kit
+   use systemd  opt+= --with-session-info=systemd
+   use consolekit  opt+= --with-session-info=console-kit
 
econf \
--localstatedir=/var \



[gentoo-commits] dev/ikelos:master commit in: dev-util/libbls/files/, dev-util/libbls/

2015-08-22 Thread Mike Auty
commit: eee53a856ba6a8560e7f7351817575e886080429
Author: layman layman AT localhost
AuthorDate: Sat Aug 22 20:01:16 2015 +
Commit: Mike Auty ikelos AT gentoo DOT org
CommitDate: Sat Aug 22 20:01:16 2015 +
URL:https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=eee53a85

Remove old libbls.

 dev-util/libbls/Manifest   |  2 -
 .../libbls/files/libbls--python-fixes.patch| 83 --
 dev-util/libbls/libbls-.ebuild | 34 -
 3 files changed, 119 deletions(-)

diff --git a/dev-util/libbls/Manifest b/dev-util/libbls/Manifest
deleted file mode 100644
index c441868..000
--- a/dev-util/libbls/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-AUX libbls--python-fixes.patch 3231 RMD160 
8468bdf254f70d9e4e336aac444b19b4d12027d2 SHA1 
517e015391325a393cbcea179528186f316f5804 SHA256 
e8e7114fe2f2daa558b0b2d62d22560abfd4262f123ce09e492f98bf0e1f9b66
-EBUILD libbls-.ebuild 736 RMD160 e914940a1be47fc2ac661164f54a5545132790e2 
SHA1 e546ef81deb8d1200d9c887a0fe1f4097a02e436 SHA256 
6e4f33994f1cbeeab590bba19e5a276e317a1cd82892a0ec15285039a7c610e5

diff --git a/dev-util/libbls/files/libbls--python-fixes.patch 
b/dev-util/libbls/files/libbls--python-fixes.patch
deleted file mode 100644
index c24c86f..000
--- a/dev-util/libbls/files/libbls--python-fixes.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/bindings/wscript_build b/bindings/wscript_build
-index 36de9c9..1084c2b 100644
 a/bindings/wscript_build
-+++ b/bindings/wscript_build
-@@ -4,24 +4,27 @@ import Build
- 
- bld.use_the_magic()
- 
--Task.simple_task_type('swig_python', '${SWIG} -o ${TGT} -python ${SRC}', 
before = 'cc')
-+Task.simple_task_type('swig_python', '${SWIG} -o ${TGT} -python ${SRC}', 
before = 'cc', ext_out = ['.c', '.py'])
- 
- @TaskGen.extension('.i')
- def process_swig(self, node):
-   cc_node = node.change_ext('.c')
--  self.create_task('swig_python', node, cc_node)
-+  py_node = node.change_ext('.py')
-+  task = self.create_task('swig_python', node, cc_node)
-   self.allnodes.append(cc_node)
--  
-+  self.allnodes.append(py_node)
-+
- if 'python' in bld.env.bindings:
-   if 'SWIG' not in bld.env:
-   raise Build.BuildError('Swig is needed to build python 
bindings')
-   py_bindings = bld(
--  features = ['cc', 'cshlib'],
-+  features = ['py', 'cc', 'cshlib'],
-   source   = 'libbls.i',
--  includes = ['/usr/include/python2.6'],  
-+  includes = bld.env.CPPPATH_PYEXT,
-   uselib_local = 'bls-%s' % 
bld.env.LIBBLS_VERSION_NO_PATCH,
-   target   = '_libbls',
--  env = bld.env_of_name('visibility-public').copy()
-+  env = bld.env_of_name('visibility-public').copy(),
-+  install_path = bld.env.PYTHONDIR
-   )
-   py_bindings.env.shlib_PATTERN = 
py_bindings.env.shlib_PATTERN.replace('lib%s', '%s')
- 
-diff --git a/doc/user/wscript_build b/doc/user/wscript_build
-index 17e733a..437ad3e 100644
 a/doc/user/wscript_build
-+++ b/doc/user/wscript_build
-@@ -3,7 +3,7 @@ import Options
- user_doc = bld(
-   target = 'user_guide.html',
-   source = ['user_guide.txt', 'user_guide.css'],
--  rule = 'rst2html --initial-header-level 2 --stylesheet-path 
${SRC[1].abspath()} ${SRC[0].abspath()}  ${TGT}',
-+  rule = 'rst2html.py --initial-header-level 2 --stylesheet-path 
${SRC[1].abspath()} ${SRC[0].abspath()}  ${TGT}',
-   install_path = '${PREFIX}/share/doc/libbls-%s' % 
bld.env.LIBBLS_VERSION_NO_PATCH
- )
- bld.install_files('${PREFIX}/share/doc/libbls-${LIBBLS_VERSION_NO_PATCH}', 
['user_guide.txt', 'user_guide.css'])
-diff --git a/wscript b/wscript
-index 4369638..d451832 100644
 a/wscript
-+++ b/wscript
-@@ -31,6 +31,7 @@ def set_options(opt):
-   
- def configure(conf):
-   conf.check_tool('compiler_cc')
-+  conf.check_tool('python')
-   conf.check_tool('misc')
-   
-   # Check required headers
-@@ -57,7 +58,7 @@ def configure(conf):
-   conf.env.append_unique('CCDEFINES', ('HAVE_%s' % 
func).upper())
-   
-   # Check optional packages
--  opt_pkgs = [('lua5.1', 'lua')]
-+  opt_pkgs = [('lua', 'lua5.1')]
-   for pkg, uselib in opt_pkgs:
-   conf.check_cfg(package = pkg, uselib_store = uselib, args = 
'--cflags --libs',
-   mandatory = 'lua' in Options.options.bindings)
-@@ -89,6 +90,10 @@ def configure(conf):
-   (conf.env.LIBBLS_VERSION_MAJOR, conf.env.LIBBLS_VERSION_MINOR, 
conf.env.LIBBLS_VERSION_PATCH) = VERSION.split('.')
-   conf.env.LIBBLS_VERSION_NO_PATCH = '%s.%s' % 
(conf.env.LIBBLS_VERSION_MAJOR, conf.env.LIBBLS_VERSION_MINOR)
- 
-+  # Check for python
-+  conf.check_python_version((2,6,0))
-+  

[gentoo-commits] dev/ikelos:master commit in: dev-python/gitty/

2015-08-22 Thread Mike Auty
commit: 3315b6a909a2aaa679ff901eeba35282c5961a91
Author: layman layman AT localhost
AuthorDate: Sat Aug 22 20:04:39 2015 +
Commit: Mike Auty ikelos AT gentoo DOT org
CommitDate: Sat Aug 22 20:04:39 2015 +
URL:https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=3315b6a9

Remove unmaintained gitty ebuild.

 dev-python/gitty/Manifest  |  1 -
 dev-python/gitty/gitty-.ebuild | 35 ---
 2 files changed, 36 deletions(-)

diff --git a/dev-python/gitty/Manifest b/dev-python/gitty/Manifest
deleted file mode 100644
index 15dade0..000
--- a/dev-python/gitty/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD gitty-.ebuild 643 RMD160 0af20b2b0398761daf88b351673b68b34dd9696e 
SHA1 1ea22aaddebdf8413d0da394efd86652e80cd513 SHA256 
14e9f523c0f4bec5a798457c44a3bf3d99107c5552f4bf4ea641f45ffc67e522

diff --git a/dev-python/gitty/gitty-.ebuild 
b/dev-python/gitty/gitty-.ebuild
deleted file mode 100644
index 115fa10..000
--- a/dev-python/gitty/gitty-.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit python git
-
-EGIT_REPO_URI=git://github.com/chipx86/gitty.git
-
-DESCRIPTION=Python-based Gitk replacement
-HOMEPAGE=http://github.com/chipx86/gitty/tree/master;
-SRC_URI=
-
-LICENSE=GPL-2
-SLOT=0
-KEYWORDS=~x86
-IUSE=
-
-DEPEND=
-RDEPEND=dev-python/pygtk
-dev-vcs/git
-
-src_install() {
-   python_version
-   dodir /usr/lib/python${PYVER}/site-packages
-   cp -r Gitty ${D}/usr/lib/python${PYVER}/site-packages
-   newbin gitty.py gitty
-}
-
-pkg_postinst() {
-   python_mod_optimize
-}
-
-pkg_postrm() {
-   python_mod_cleanup
-}



[gentoo-commits] dev/ikelos:master commit in: dev-python/git-python/

2015-08-22 Thread Mike Auty
commit: 61c63cf82d26c4533fec4173480d27d68017760a
Author: layman layman AT localhost
AuthorDate: Sat Aug 22 20:03:49 2015 +
Commit: Mike Auty ikelos AT gentoo DOT org
CommitDate: Sat Aug 22 20:03:49 2015 +
URL:https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=61c63cf8

Remove old git-python  ebuild.

 dev-python/git-python/Manifest   |  1 -
 dev-python/git-python/git-python-.ebuild | 27 ---
 2 files changed, 28 deletions(-)

diff --git a/dev-python/git-python/Manifest b/dev-python/git-python/Manifest
deleted file mode 100644
index 61e52e3..000
--- a/dev-python/git-python/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD git-python-.ebuild 478 RMD160 
99a6931f19e12e64042ee1d55565c62cf0a85f78 SHA1 
74eaf2d28a4fc200fcc2f695a69aa8507ff7c76e SHA256 
a6e2e0870679b1bd35f837711664d531fae60b3767015208c0257c0b16b2

diff --git a/dev-python/git-python/git-python-.ebuild 
b/dev-python/git-python/git-python-.ebuild
deleted file mode 100644
index c4d44e5..000
--- a/dev-python/git-python/git-python-.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit distutils git
-
-EGIT_REPO_URI=http://git.gitorious.org/git-python/mainline.git;
-
-MY_PN=GitPython
-
-DESCRIPTION=Python API for Git
-HOMEPAGE=http://pypi.python.org/pypi/GitPython/;
-SRC_URI=
-
-LICENSE=BSD
-SLOT=0
-KEYWORDS=-x86 -amd64
-IUSE=
-
-DEPEND=dev-lang/python
-   dev-vcs/git
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_PN}-${PV}
-



[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/

2015-08-22 Thread Matt Turner
commit: 0064e9d163f4458b17981d3a1efa7e004d387964
Author: Matt Turner mattst88 AT gentoo DOT org
AuthorDate: Sun Aug 23 01:14:43 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Aug 23 01:19:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0064e9d1

x11-libs/cairo: Drop version 1.12.18-r1.

Package-Manager: portage-2.2.20.1

 x11-libs/cairo/Manifest|   1 -
 x11-libs/cairo/cairo-1.12.18-r1.ebuild | 174 -
 x11-libs/cairo/metadata.xml|   3 -
 3 files changed, 178 deletions(-)

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index b1abad9..a4a4ba6 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,2 +1 @@
-DIST cairo-1.12.18.tar.xz 38276736 SHA256 
dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6 SHA512 
238b426ee010a0b0a8d55e61043f95a87438f73f900b3b293dea61b8e7ff3cc84e0aa0b779b2a1d43d2d153490bd053cbbc9ec69ceb9b3f482797638260fbef2
 WHIRLPOOL 
e4408a3f6185f1d7e0f1c95f4beb266c48722ba075329621c1a6a6f2ad3114c334ceb6b242d661d7d3e7e7a3b3fcd013c5806c17b637bfa7a59895cc70fc66cf
 DIST cairo-1.14.2.tar.xz 35376404 SHA256 
c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb SHA512 
74d30f3f879f097b2c3408ef9698da8f337301f971c3eba7f336d02d6b2812d2ca0bd8bbc0cc7ee11127d3574910b1b77fde3b065cfd504436b62e17c2acb200
 WHIRLPOOL 
fd57e1f474280a1df7a641bdcbe4dc5e5a71bd53b9e46e54302c7858e3bc0081fd1145f19133152819d259611096e4cca034c9caa73a748a507de9094f81a519

diff --git a/x11-libs/cairo/cairo-1.12.18-r1.ebuild 
b/x11-libs/cairo/cairo-1.12.18-r1.ebuild
deleted file mode 100644
index 02e5775..000
--- a/x11-libs/cairo/cairo-1.12.18-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic autotools multilib-minimal
-
-if [[ ${PV} == ** ]]; then
-   inherit git-2
-   EGIT_REPO_URI=git://anongit.freedesktop.org/git/cairo
-   SRC_URI=
-else
-   SRC_URI=http://cairographics.org/releases/${P}.tar.xz;
-   KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris
-fi
-
-DESCRIPTION=A vector graphics library with cross-device output support
-HOMEPAGE=http://cairographics.org/;
-LICENSE=|| ( LGPL-2.1 MPL-1.1 )
-SLOT=0
-IUSE=X aqua debug directfb drm gallium gles2 +glib opengl openvg qt4 
static-libs +svg valgrind xcb xlib-xcb
-# gtk-doc regeneration doesn't seem to work with out-of-source builds
-#[[ ${PV} == ** ]]  IUSE=${IUSE} doc # API docs are provided in 
tarball, no need to regenerate
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test 
needs gtk+ so we need to block it
-RESTRICT=test
-
-RDEPEND==dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
-   =media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-   =media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
-   =media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
-   =sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-   =x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
-   directfb? ( dev-libs/DirectFB )
-   gles2? ( =media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
-   glib? ( =dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-   opengl? ( || ( =media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] 
media-libs/opengl-apple ) )
-   openvg? ( =media-libs/mesa-9.1.6[openvg,${MULTILIB_USEDEP}] )
-   qt4? ( =dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] )
-   X? (
-   =x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-   =x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-   =x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-   drm? (
-   =virtual/libudev-208:=[${MULTILIB_USEDEP}]
-   gallium? ( 
=media-libs/mesa-9.1.6[gallium,${MULTILIB_USEDEP}] )
-   )
-   )
-   xcb? (
-   =x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-   )
-   abi_x86_32? (
-   !=app-emulation/emul-linux-x86-gtklibs-20131008-r1
-   !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-   )
-DEPEND=${RDEPEND}
-   virtual/pkgconfig
-   =sys-devel/libtool-2
-   X? (
-   =x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
-   drm? (
-   =x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-   =x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-   )
-   )
-#[[ ${PV} == ** ]]  DEPEND=${DEPEND}
-#  doc? (
-#  =dev-util/gtk-doc-1.6
-#  ~app-text/docbook-xml-dtd-4.2
-#  )
-
-# drm module requires X
-# for gallium we need to enable drm
-REQUIRED_USE=
-   drm? ( X )
-   gallium? ( drm )
-  

[gentoo-commits] repo/gentoo:master commit in: profiles/base/

2015-08-22 Thread Matt Turner
commit: 865ed0ed1b41ad7f35860bd22ea852717f967c3f
Author: Matt Turner mattst88 AT gentoo DOT org
AuthorDate: Sun Aug 23 01:18:06 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Aug 23 01:19:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=865ed0ed

profiles/base/package.use.mask: Drop old cairo/drm entry.

 profiles/base/package.use.mask | 4 
 1 file changed, 4 deletions(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 4848c1d..bd05cc3 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -685,10 +685,6 @@ net-dns/pdnsd isdn urandom
 # Upstream didn't release patches for aria yet
 =sci-chemistry/cns-1.3 aria
 
-# Tomáš Chvátal scarab...@gentoo.org (8 Sep 2010)
-# drm don't even build here so mask everywhere expect live.
-x11-libs/cairo- drm
-
 # Alex Legler a...@gentoo.org (1 Sep 2010)
 # This feature is marked as experimental by upstream.
 dev-lang/ruby-enterprise fastthreading



[gentoo-commits] dev/ikelos:master commit in: net-misc/facebook-notify/

2015-08-22 Thread Mike Auty
commit: 174dcd3a52f8f569bb410cbaeb5e45ffb5f78be8
Author: layman layman AT localhost
AuthorDate: Sun Aug 23 01:47:13 2015 +
Commit: Mike Auty ikelos AT gentoo DOT org
CommitDate: Sun Aug 23 01:47:13 2015 +
URL:https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=174dcd3a

Remove old facebook-notify ebuild.

 net-misc/facebook-notify/Manifest  |  2 --
 .../facebook-notify/facebook-notify-.ebuild| 31 --
 2 files changed, 33 deletions(-)

diff --git a/net-misc/facebook-notify/Manifest 
b/net-misc/facebook-notify/Manifest
deleted file mode 100644
index be88d0b..000
--- a/net-misc/facebook-notify/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-AUX facebook-notify--submodule.patch 428 RMD160 
30c98dff0576b79c6f514712070b6b74191862b6 SHA1 
46fd83056e7d2ba1cfffa7e4d89ff6228756ec3b SHA256 
f5699852e554ee34a72e62bd3a12ab0bd4c4dfc55f1a4548f34746ab9f7726fb
-EBUILD facebook-notify-.ebuild 604 RMD160 
0665321626ac6e8311b9765ac73a090dc5c2ec2f SHA1 
0387c078acdd4f92a3ded235669c605cf3bc779a SHA256 
8c0ee403793b2cd14b37e7ca1b33e8334eb49b1a0ea76f7f7b95a37f7157fe53

diff --git a/net-misc/facebook-notify/facebook-notify-.ebuild 
b/net-misc/facebook-notify/facebook-notify-.ebuild
deleted file mode 100644
index 7a0198e..000
--- a/net-misc/facebook-notify/facebook-notify-.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit distutils git eutils
-
-EGIT_REPO_URI=git://github.com/nzjrs/facebook-notify
-
-DESCRIPTION=Facebook notification tool
-HOMEPAGE=http://nzjrs.github.com/facebook-notify/;
-SRC_URI=
-
-LICENSE=GPL-3
-SLOT=0
-KEYWORDS=~x86 ~amd64
-IUSE=
-
-DEPEND=dev-python/pygtk
-   dev-python/pywebkitgtk
-RDEPEND=${DEPEND}
-
-src_unpack() {
-   git_src_unpack
-}
-
-src_prepare() {
-   cd ${S}
-   sed -i -e 
's/libfacebooknotify/libfacebooknotify,libfacebooknotify.facebook/' setup.py
-}



[gentoo-commits] repo/gentoo:master commit in: x11-libs/libdrm/

2015-08-22 Thread Matt Turner
commit: 985d633a0b91e2fed5f35f369a29e30a31b01a12
Author: Matt Turner mattst88 AT gentoo DOT org
AuthorDate: Sun Aug 23 03:22:09 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Aug 23 03:25:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=985d633a

x11-libs/libdrm: Add git ebuild.

Package-Manager: portage-2.2.20.1

 x11-libs/libdrm/libdrm-.ebuild | 62 ++
 1 file changed, 62 insertions(+)

diff --git a/x11-libs/libdrm/libdrm-.ebuild 
b/x11-libs/libdrm/libdrm-.ebuild
new file mode 100644
index 000..ce2fa6d
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION=X.Org libdrm library
+HOMEPAGE=http://dri.freedesktop.org/;
+if [[ ${PV} = * ]]; then
+   EGIT_REPO_URI=git://anongit.freedesktop.org/git/mesa/drm
+   KEYWORDS=
+else
+   SRC_URI=http://dri.freedesktop.org/${PN}/${P}.tar.bz2;
+   KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux 
~arm-linux ~x86-linux
+fi
+
+VIDEO_CARDS=exynos freedreno intel nouveau omap radeon tegra vmware
+for card in ${VIDEO_CARDS}; do
+   IUSE_VIDEO_CARDS+= video_cards_${card}
+done
+
+IUSE=${IUSE_VIDEO_CARDS} libkms valgrind
+RESTRICT=test # see bug #236845
+
+RDEPEND==dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+   video_cards_intel? ( 
=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+   abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+DEPEND=${RDEPEND}
+   valgrind? ( dev-util/valgrind )
+
+src_prepare() {
+   if [[ ${PV} = * ]]; then
+   # tests are restricted, no point in building them
+   sed -ie 's/tests //' ${S}/Makefile.am
+   fi
+   xorg-2_src_prepare
+}
+
+src_configure() {
+   XORG_CONFIGURE_OPTIONS=(
+   # Udev is only used by tests now.
+   --disable-udev
+   --disable-cairo-tests
+   $(use_enable video_cards_exynos exynos-experimental-api)
+   $(use_enable video_cards_freedreno freedreno)
+   $(use_enable video_cards_intel intel)
+   $(use_enable video_cards_nouveau nouveau)
+   $(use_enable video_cards_omap omap-experimental-api)
+   $(use_enable video_cards_radeon radeon)
+   $(use_enable video_cards_radeon amdgpu)
+   $(use_enable video_cards_tegra tegra-experimental-api)
+   $(use_enable video_cards_vmware vmwgfx)
+   $(use_enable libkms)
+   # valgrind installs its .pc file to the pkgconfig for the 
primary arch
+   --enable-valgrind=$(usex valgrind auto no)
+   )
+
+   xorg-2_src_configure
+}



[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/

2015-08-22 Thread Jason Zaman
commit: 74d30592c6783e80a8fab93628563cdba1536773
Author: Jason Zaman jason AT perfinion DOT com
AuthorDate: Sat Aug 22 16:11:22 2015 +
Commit: Jason Zaman perfinion AT gentoo DOT org
CommitDate: Sat Aug 22 16:11:22 2015 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=74d30592

pulseaudio: allow clients to list user tmp dirs

/tmp/pulse-* gets created by the clients usually as user_tmp_t

bug 556526

 policy/modules/contrib/pulseaudio.te | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/policy/modules/contrib/pulseaudio.te 
b/policy/modules/contrib/pulseaudio.te
index d7f48be..ea5b2a9 100644
--- a/policy/modules/contrib/pulseaudio.te
+++ b/policy/modules/contrib/pulseaudio.te
@@ -277,4 +277,7 @@ ifdef(`distro_gentoo',`
manage_lnk_files_pattern(pulseaudio_client, pulseaudio_xdg_config_t, 
pulseaudio_xdg_config_t)
manage_dirs_pattern(pulseaudio_client, pulseaudio_xdg_config_t, 
pulseaudio_xdg_config_t)
xdg_config_home_filetrans(pulseaudio_client, pulseaudio_xdg_config_t, 
dir, pulse)
+
+   # /tmp/pulse-* gets created by the clients usually as user_tmp_t, bug 
556526
+   userdom_list_user_tmp(pulseaudio_client)
 ')



[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/

2015-08-22 Thread Jason Zaman
commit: dcc726fd493cae4e694163d0fd303b7e36c0ffa6
Author: Jason Zaman jason AT perfinion DOT com
AuthorDate: Sat Aug 22 16:20:23 2015 +
Commit: Jason Zaman perfinion AT gentoo DOT org
CommitDate: Sat Aug 22 16:20:23 2015 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=dcc726fd

android: android_tools needs to be able to read the sdk

 policy/modules/contrib/android.te | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/policy/modules/contrib/android.te 
b/policy/modules/contrib/android.te
index 930c6b3..6d6c94b 100644
--- a/policy/modules/contrib/android.te
+++ b/policy/modules/contrib/android.te
@@ -49,6 +49,9 @@ can_exec(android_tools_t, android_tools_exec_t)
 manage_dirs_pattern(android_tools_t, android_home_t, android_home_t)
 manage_files_pattern(android_tools_t, android_home_t, android_home_t)
 
+list_dirs_pattern(android_tools_t, android_sdk_t, android_sdk_t)
+read_files_pattern(android_tools_t, android_sdk_t, android_sdk_t)
+
 files_tmp_filetrans(android_tools_t, android_tmp_t, { file dir })
 manage_dirs_pattern(android_tools_t, android_tmp_t, android_tmp_t)
 manage_files_pattern(android_tools_t, android_tmp_t, android_tmp_t)



[gentoo-commits] repo/gentoo:master commit in: kde-misc/kdirstat/

2015-08-22 Thread Michael Palimaka
commit: 27f66a59aab92af21c41e2146e8d0257c24f8431
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sat Aug 22 18:43:48 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sat Aug 22 18:44:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27f66a59

kde-misc/kdirstat: version bump.

Package-Manager: portage-2.2.20.1

 kde-misc/kdirstat/Manifest|  1 +
 kde-misc/kdirstat/kdirstat-3.0.ebuild | 45 +++
 2 files changed, 46 insertions(+)

diff --git a/kde-misc/kdirstat/Manifest b/kde-misc/kdirstat/Manifest
index d8edb61..010f62e 100644
--- a/kde-misc/kdirstat/Manifest
+++ b/kde-misc/kdirstat/Manifest
@@ -1 +1,2 @@
 DIST k4dirstat-2.7.5.tar.bz2 225485 SHA256 
20fcf97285c8e1836cec94b05dc4e3ae92e0f7e806cd278d46ec2c3287f5ff31 SHA512 
57853c00c26cbef13523455c854e38da7eddfb4382c6143a25a2c43a319c4c03037cba44340097c0612a329f2308f0f1e54ffe8cf1329d8d05755231a50da895
 WHIRLPOOL 
c37a2797caec7515fcaca93f9ca3d8103bfb151526d6c5148f19f58e673ae2f13e71b2d76f626c9d148ab402efeefa2a3f2747ad7c88e7c8f3a46cd3ef646419
+DIST k4dirstat-3.0.tar.bz2 231647 SHA256 
edbae93e477556e48dc45b93f6462e8b7ca61cacf3d38c97d1a81c412860bb12 SHA512 
07b707e09c71fab1614a917172ac4182a1460b4413ce497d26d34f85624d588ae7424366773d288c8070d1bc070633c7a6667d4950c4cb77b890ef2afe5e5b64
 WHIRLPOOL 
f3069ceaef3a1a7cd7bcc9f6fa92febbe5f15e1aaaf51da79e2889663d165ab26f629d7341df07fd6629b66656816312d201eff974e9eaa4a4f66560da83d77f

diff --git a/kde-misc/kdirstat/kdirstat-3.0.ebuild 
b/kde-misc/kdirstat/kdirstat-3.0.ebuild
new file mode 100644
index 000..81cec91
--- /dev/null
+++ b/kde-misc/kdirstat/kdirstat-3.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION=Nice KDE replacement to the du command
+HOMEPAGE=https://bitbucket.org/jeromerobert/k4dirstat/;
+SRC_URI=https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-${PV}.tar.bz2;
+
+LICENSE=GPL-2
+SLOT=5
+KEYWORDS=~amd64 ~x86
+IUSE=
+
+RDEPEND=
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   sys-libs/zlib
+   !kde-misc/kdirstat:4
+
+DEPEND=${RDEPEND}
+   $(add_frameworks_dep kdoctools)
+   sys-devel/gettext
+
+
+DOCS=( AUTHORS CREDITS TODO )
+
+src_unpack() {
+   # tarball contains git revision hash, which we don't want in the ebuild.
+   default
+   mv ${WORKDIR}/*k4dirstat-* ${S} || die
+}



[gentoo-commits] repo/gentoo:master commit in: profiles/default/bsd/fbsd/amd64/10.1/, profiles/default/bsd/fbsd/amd64/10.2/

2015-08-22 Thread Michał Górny
commit: 62f1d0a7a1f24a8a69b3653c0f885766922ab1ac
Author: Yuta Satoh nigoro AT gentoo DOT gr DOT jp
AuthorDate: Sat Aug 22 12:01:14 2015 +
Commit: Michał Górny mgorny AT gentoo DOT org
CommitDate: Sat Aug 22 12:01:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f1d0a7

profiles: FreeBSD 10.0 or later, python3 force set USE=threads on amd64-fbsd.

 profiles/default/bsd/fbsd/amd64/10.1/package.use.force | 4 +---
 profiles/default/bsd/fbsd/amd64/10.2/package.use.force | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/profiles/default/bsd/fbsd/amd64/10.1/package.use.force 
b/profiles/default/bsd/fbsd/amd64/10.1/package.use.force
index 4229a8f..c80eeb6 100644
--- a/profiles/default/bsd/fbsd/amd64/10.1/package.use.force
+++ b/profiles/default/bsd/fbsd/amd64/10.1/package.use.force
@@ -1,4 +1,2 @@
 # =dev-lang/python-3.2 requires threads, #494744
-=dev-lang/python-3.2* threads
-=dev-lang/python-3.3* threads
-
+=dev-lang/python-3* threads

diff --git a/profiles/default/bsd/fbsd/amd64/10.2/package.use.force 
b/profiles/default/bsd/fbsd/amd64/10.2/package.use.force
index 4229a8f..c80eeb6 100644
--- a/profiles/default/bsd/fbsd/amd64/10.2/package.use.force
+++ b/profiles/default/bsd/fbsd/amd64/10.2/package.use.force
@@ -1,4 +1,2 @@
 # =dev-lang/python-3.2 requires threads, #494744
-=dev-lang/python-3.2* threads
-=dev-lang/python-3.3* threads
-
+=dev-lang/python-3* threads



[gentoo-commits] repo/gentoo:master commit in: /

2015-08-22 Thread Michał Górny
commit: e543f16ed10c1782ccdc950f10a7126769ecf361
Author: Michał Górny mgorny AT gentoo DOT org
AuthorDate: Sat Aug 22 20:33:16 2015 +
Commit: Michał Górny mgorny AT gentoo DOT org
CommitDate: Sat Aug 22 20:33:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e543f16e

Merge profiles: FreeBSD 10.0 or later, python3 force set USE=threads on 
amd64-fbsd.

Pull-Request: https://github.com/gentoo/gentoo/pull/30

 profiles/default/bsd/fbsd/amd64/10.1/package.use.force | 4 +---
 profiles/default/bsd/fbsd/amd64/10.2/package.use.force | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)



[gentoo-commits] repo/gentoo:master commit in: kde-misc/kde-gtk-config/, kde-misc/kde-gtk-config/files/

2015-08-22 Thread Michael Palimaka
commit: c27d311c1b3fe28a5357a81c88beccefe21aff72
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sat Aug 22 17:04:40 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sat Aug 22 17:04:40 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c27d311c

kde-misc/kde-gtk-config: backport patch from upstream fixing build with 
kde-base/kdelibs-4.14.11

Gentoo-bug: 558388

Package-Manager: portage-2.2.20.1

 .../kde-gtk-config-2.2.1-kdelibs-4.14.11.patch | 52 ++
 .../kde-gtk-config/kde-gtk-config-2.2.1.ebuild |  2 +
 2 files changed, 54 insertions(+)

diff --git 
a/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch 
b/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch
new file mode 100644
index 000..ca20682
--- /dev/null
+++ b/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch
@@ -0,0 +1,52 @@
+From 386f6af25a4f5276765a121f98dd00d0bf6a743d Mon Sep 17 00:00:00 2001
+From: David Faure fa...@kde.org
+Date: Sun, 26 Jul 2015 17:04:43 +0200
+Subject: [PATCH] set proper cmake min req, matching kdelibs4, before project;
+ fix build accordingly
+
+---
+ CMakeLists.txt | 2 +-
+ gtk3proxies/CMakeLists.txt | 2 +-
+ gtkproxies/CMakeLists.txt  | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0ef2243..9d77fcd 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -1,5 +1,5 @@
++cmake_minimum_required(VERSION 2.8.9)
+ project(kdegtkconfig)
+-cmake_minimum_required(VERSION 2.6)
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+ 
+ find_package(KDE4 REQUIRED)
+diff --git a/gtk3proxies/CMakeLists.txt b/gtk3proxies/CMakeLists.txt
+index 856a3f6..d43597e 100644
+--- a/gtk3proxies/CMakeLists.txt
 b/gtk3proxies/CMakeLists.txt
+@@ -2,7 +2,7 @@ find_package(GTK3 REQUIRED)
+ 
+ include_directories(${GTK3_INCLUDE_DIRS})
+ 
+-add_definitions(-DDATA_DIR=\\\${DATA_INSTALL_DIR}/kcm-gtk-module/\\\)
++add_definitions(-DDATA_DIR=\\\${DATA_INSTALL_DIR}/kcm-gtk-module/\\\)
+ 
+ add_executable(gtk3_preview preview3.c)
+ target_link_libraries(gtk3_preview ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} 
${GLIB2_LIBRARY})
+diff --git a/gtkproxies/CMakeLists.txt b/gtkproxies/CMakeLists.txt
+index 9821cbf..18ee2d5 100644
+--- a/gtkproxies/CMakeLists.txt
 b/gtkproxies/CMakeLists.txt
+@@ -6,7 +6,7 @@ add_executable(reload_gtk_apps reload.c)
+ target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES})
+ install(TARGETS reload_gtk_apps RUNTIME DESTINATION 
${KDE4_LIBEXEC_INSTALL_DIR})
+ 
+-add_definitions(-DDATA_DIR=\\\${DATA_INSTALL_DIR}/kcm-gtk-module/\\\)
++add_definitions(-DDATA_DIR=\\\${DATA_INSTALL_DIR}/kcm-gtk-module/\\\)
+ 
+ add_executable(gtk_preview preview.c)
+ target_link_libraries(gtk_preview ${GTK2_LIBRARIES} ${GTK2_GIOMM_LIBRARY})
+-- 
+2.4.6
+

diff --git a/kde-misc/kde-gtk-config/kde-gtk-config-2.2.1.ebuild 
b/kde-misc/kde-gtk-config/kde-gtk-config-2.2.1.ebuild
index 7f445b3..d570c67 100644
--- a/kde-misc/kde-gtk-config/kde-gtk-config-2.2.1.ebuild
+++ b/kde-misc/kde-gtk-config/kde-gtk-config-2.2.1.ebuild
@@ -32,6 +32,8 @@ RDEPEND=
$(add_kdeapps_dep kcmshell)
 
 
+PATCHES=( ${FILESDIR}/${P}-kdelibs-4.14.11.patch )
+
 pkg_postinst() {
kde4-base_pkg_postinst
einfo



[gentoo-commits] dev/yngwin:master commit in: media-sound/helm/files/, media-sound/helm/

2015-08-22 Thread Ben de Groot
commit: 7d8c7d1e78d748c37c052c92856b7ee6fafecbe2
Author: Ben de Groot yngwin AT gentoo DOT org
AuthorDate: Sat Aug 22 17:06:35 2015 +
Commit: Ben de Groot yngwin AT gentoo DOT org
CommitDate: Sat Aug 22 17:06:35 2015 +
URL:https://gitweb.gentoo.org/dev/yngwin.git/commit/?id=7d8c7d1e

media-sound/helm: add live ebuild

Package-Manager: portage-2.2.20.1

 media-sound/helm/Manifest   |  1 -
 .../helm/files/helm-0.4.1-vst-location.patch| 20 
 media-sound/helm/files/helm-vst-location.patch  | 21 +
 .../helm/{helm-0.4.1.ebuild = helm-.ebuild}| 18 ++
 4 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/media-sound/helm/Manifest b/media-sound/helm/Manifest
deleted file mode 100644
index 7090407..000
--- a/media-sound/helm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST helm-0.4.1.tar.gz 10170154 SHA256 
00fa6b973b3e13d574a19dc009e07cbbcb7823476ffc59cc89e6816b7a70bd72 SHA512 
093abfd47a7f3e25d168df675b8a9c067a361ae1891af208c75ec4bc02d8a30cc5de4ab2433179bcbb6074c142c8ef9b4ef11b1854fdde0551fcd340dd6b8fe0
 WHIRLPOOL 
6d7297b2e064d24252d11b415225e081cb2033230aba013e774198b66e6ca89196691ed8db61d9baa02e7cc09497af61462f36244668a8b3469828388f3c5d49

diff --git a/media-sound/helm/files/helm-0.4.1-vst-location.patch 
b/media-sound/helm/files/helm-0.4.1-vst-location.patch
deleted file mode 100644
index faa1a17..000
--- a/media-sound/helm/files/helm-0.4.1-vst-location.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 helm-0.4.1.orig/builds/linux/VST/Makefile  2015-08-04 06:06:31.0 
+0800
-+++ helm-0.4.1/builds/linux/VST/Makefile   2015-08-17 20:09:55.781014640 
+0800
-@@ -18,7 +18,7 @@
- TARGET_ARCH := 
-   endif
- 
--  CPPFLAGS := $(DEPFLAGS) -D LINUX=1 -D DEBUG=1 -D _DEBUG=1 -D 
JUCER_LINUX_MAKE_1D79FBD2=1 -D JUCE_APP_VERSION=0.4.1 -D 
JUCE_APP_VERSION_HEX=0x401 -I /usr/include -I /usr/include/freetype2 -I 
~/srcs/VST3\ SDK -I ~/srcs/vstsdk2.4 -I ../../../JuceLibraryCode -I 
../../../JUCE/modules -I ../../../mopo/src -I ../../../src -I 
../../../src/common -I ../../../src/editor_components -I 
../../../src/editor_sections -I ../../../src/look_and_feel -I 
../../../src/standalone -I ../../../src/synthesis
-+  CPPFLAGS := $(DEPFLAGS) -D LINUX=1 -D DEBUG=1 -D _DEBUG=1 -D 
JUCER_LINUX_MAKE_1D79FBD2=1 -D JUCE_APP_VERSION=0.4.1 -D 
JUCE_APP_VERSION_HEX=0x401 -I /usr/include -I /usr/include/freetype2 -I 
/usr/share/vst-sdk/VST3-SDK -I ../../../JuceLibraryCode -I 
../../../JUCE/modules -I ../../../mopo/src -I ../../../src -I 
../../../src/common -I ../../../src/editor_components -I 
../../../src/editor_sections -I ../../../src/look_and_feel -I 
../../../src/standalone -I ../../../src/synthesis
-   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -fPIC -O0 -ffast-math 
-mtune=generic -msse -msse2 -mfpmath=sse
-   CXXFLAGS += $(CFLAGS) -std=c++11
-   LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -Wl,--no-undefined 
-shared -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype 
-lpthread -lrt -ffast-math -mtune=generic -msse -msse2 -mfpmath=sse
-@@ -38,7 +38,7 @@
- TARGET_ARCH := 
-   endif
- 
--  CPPFLAGS := $(DEPFLAGS) -D LINUX=1 -D NDEBUG=1 -D 
JUCER_LINUX_MAKE_1D79FBD2=1 -D JUCE_APP_VERSION=0.4.1 -D 
JUCE_APP_VERSION_HEX=0x401 -I /usr/include -I /usr/include/freetype2 -I 
~/srcs/VST3\ SDK -I ~/srcs/vstsdk2.4 -I ../../../JuceLibraryCode -I 
../../../JUCE/modules -I ../../../mopo/src -I ../../../src -I 
../../../src/common -I ../../../src/editor_components -I 
../../../src/editor_sections -I ../../../src/look_and_feel -I 
../../../src/standalone -I ../../../src/synthesis
-+  CPPFLAGS := $(DEPFLAGS) -D LINUX=1 -D NDEBUG=1 -D 
JUCER_LINUX_MAKE_1D79FBD2=1 -D JUCE_APP_VERSION=0.4.1 -D 
JUCE_APP_VERSION_HEX=0x401 -I /usr/include -I /usr/include/freetype2 -I 
/usr/share/vst-sdk/VST3-SDK -I ../../../JuceLibraryCode -I 
../../../JUCE/modules -I ../../../mopo/src -I ../../../src -I 
../../../src/common -I ../../../src/editor_components -I 
../../../src/editor_sections -I ../../../src/look_and_feel -I 
../../../src/standalone -I ../../../src/synthesis
-   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -Os -ffast-math -mtune=generic 
-msse -msse2 -mfpmath=sse
-   CXXFLAGS += $(CFLAGS) -std=c++11
-   LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -Wl,--no-undefined 
-shared -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama 
-lasound -ldl -lfreetype -lpthread -lrt -ffast-math -mtune=generic -msse -msse2 
-mfpmath=sse

diff --git a/media-sound/helm/files/helm-vst-location.patch 
b/media-sound/helm/files/helm-vst-location.patch
new file mode 100644
index 000..a82bc50
--- /dev/null
+++ b/media-sound/helm/files/helm-vst-location.patch
@@ -0,0 +1,21 @@
+diff -burN helm-.orig/builds/linux/VST/Makefile 
helm-/builds/linux/VST/Makefile
+--- helm-.orig/builds/linux/VST/Makefile   2015-08-23 00:52:12.611831553 
+0800
 

[gentoo-commits] dev/yngwin:master commit in: media-libs/vst-sdk/

2015-08-22 Thread Ben de Groot
commit: 5a9d6cafc8283f140a195001efa6bc4b92deb8da
Author: Ben de Groot yngwin AT gentoo DOT org
AuthorDate: Sat Aug 22 17:11:16 2015 +
Commit: Ben de Groot yngwin AT gentoo DOT org
CommitDate: Sat Aug 22 17:11:16 2015 +
URL:https://gitweb.gentoo.org/dev/yngwin.git/commit/?id=5a9d6caf

media-libs/vst-sdk: change install location

 media-libs/vst-sdk/vst-sdk-3.6.5.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/vst-sdk/vst-sdk-3.6.5.ebuild 
b/media-libs/vst-sdk/vst-sdk-3.6.5.ebuild
index a860580..3ea8d8b 100644
--- a/media-libs/vst-sdk/vst-sdk-3.6.5.ebuild
+++ b/media-libs/vst-sdk/vst-sdk-3.6.5.ebuild
@@ -25,17 +25,17 @@ RESTRICT=mirror
 S=${WORKDIR}
 
 src_prepare() {
-   mv VST3 SDK VST3-SDK || die
+   mv VST3 SDK vst3-sdk || die
 }
 
 src_compile() { :; }
 
 src_install() {
-   insinto /usr/share/${PN}
-   doins -r VST3-SDK
+   insinto /usr/share
+   doins -r vst3-sdk
 }
 
 pkg_postinst() {
einfo Please make sure to review the license agreement, which can be 
found at:
-   einfo ${ROOT}usr/share/${PN}/VST3-SDK/doc/VST3_License_Agreement.html
+   einfo ${ROOT}usr/share/vst3-sdk/doc/VST3_License_Agreement.html
 }



[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/

2015-08-22 Thread Mike Gilbert
commit: 30b7eaab5242261112b9621d5716c84093f52a3f
Author: Mike Gilbert floppym AT gentoo DOT org
AuthorDate: Sat Aug 22 17:16:06 2015 +
Commit: Mike Gilbert floppym AT gentoo DOT org
CommitDate: Sat Aug 22 17:16:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30b7eaab

sys-apps/systemd: Remove old

Package-Manager: portage-2.2.20_p134

 sys-apps/systemd/Manifest  |   7 -
 sys-apps/systemd/metadata.xml  |   1 -
 sys-apps/systemd/systemd-216-r3.ebuild | 496 -
 sys-apps/systemd/systemd-220-r2.ebuild | 494 
 sys-apps/systemd/systemd-221.ebuild| 489 
 sys-apps/systemd/systemd-222-r1.ebuild | 480 ---
 sys-apps/systemd/systemd-222.ebuild| 482 
 sys-apps/systemd/systemd-224.ebuild| 476 ---
 8 files changed, 2925 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index aa61474..d0ae4b4 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,11 +1,4 @@
-DIST systemd-216.tar.xz 3612960 SHA256 
945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 
f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2
 WHIRLPOOL 
505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494
 DIST systemd-218.tar.xz 3782276 SHA256 
1b0768b53b6c6d813a93a4b8fe1f80cf53561b09075010a97c7aa08eee3fd59b SHA512 
c183cce8532ccb4716b84587c96a626eea390202a5469b9d89c8cee7f703e40d7c584e05f29501d375b8cd2a1409d011de564df16f54e27f66b3c3007a6e5bd4
 WHIRLPOOL 
4d0bcf3ddfecd3354d9f4ab13851f8da6baf31e89e64d3b1ac671159f16f23597d88cc2525aece2f867c140fc97e80bce086a5af91f84b8095e2503c13995e6d
 DIST systemd-219_p112.tar.xz 3944604 SHA256 
8394ca0d55b05cb07c2187da8b614f3cb4eacc297c501dd09a31dad18acf28ea SHA512 
480526ff45a8588b3a572ccc455d6357208093f5dae858947182f6e9e4595c1f612d1b661eff41f39f5df6ad0dcb6b0a08b08c15125baf1cf07402ac18a5130b
 WHIRLPOOL 
cf1ea60dc59a2a3f54cb66d24a529b742bd403f996a9e8f132fd9f9dc551308ee233fec4fec3e8feb7a657ccdd25e56a6e0756633a1c76a9c427588b262558d9
-DIST systemd-220-gentoo-r2.tar.xz 7008 SHA256 
9d40328056437d0ad799ef6c659e1017cba482888b8f03b8b4628990d79b2a20 SHA512 
b0c45d73ee0d0be114f48f4e071a596d6d069c04c8012761aae33658fe569f6ab89e6df370101432484c288b79eb1aef6f0e6c586ce0237c455c7ba6e23d3ab7
 WHIRLPOOL 
2b017f5d453bd485203a613f6cad424067cb4f561c070e3b2574fdfa1877da3ab45e98d647eec463df8c625c2ce13d7289f439f5ac7a76c2d4f44b256a834d24
-DIST systemd-220-src-boot-efi.tar.xz 19024 SHA256 
63aa064938e6d295a2ac4b308876c161aff9eddd1d2012cec0ce00d9b8423469 SHA512 
33f8b7d2d09c7dc2f9c55791ab855e3b1763a17db8dd534f67bc4b116def905c2782039e38bb93cd071b198ef582b1d923a5eb15b97a0d6983cb0afffdccdef9
 WHIRLPOOL 
675654d1fe5c021d7f9ec10d439ccd959812e69b0b816cbdb12508516e41be416a0e7adcb556f49aa7abfaceba4f682ccd353628ddf87cc8d507e5e75ea750b8
-DIST systemd-220.tar.xz 4036028 SHA256 
3659588c40221ee7257502c0735491f72796dbe17be560013f6d310deb446332 SHA512 
c309b4309f8b8d2d97450fb281053feec7b89227626b69e37f3a0d2154c2810c217e58e218f17da11c04f703c6196cec21c4afdcf63879bc736bbdca058a5da5
 WHIRLPOOL 
2f8974eacb706987e85c7907a517f6b2d47b009f9259a36375537c8bd09bc4774c81e8dc853aa83e644d7c1b579f5113d0bb8a504c7caa5a9240750f9936d561
-DIST systemd-221.tar.xz 4010048 SHA256 
085e088650afbfc688ccb13459aedb1fbc7c8810358605b076301f472d51cc4f SHA512 
db2552674f1d656e0398b461b42738fcad40dd64700700a7041650581981e7ac563652ef45b859f73a74058bf0a428c26402b5356cfe50b59c20c2678441ab0f
 WHIRLPOOL 
00939e03a780972ef9ce3a8833ed150c067d86094ea11b92baba42469969653ed8f156744fcde1809df6b127f48e82d73391aec9340146829d83312a40cfb138
-DIST systemd-222.tar.gz 4015599 SHA256 
b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 
83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47
 WHIRLPOOL 
dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
 DIST systemd-224.tar.gz 3868075 SHA256 
0d7ac1532a57639fbc828f8a5051a090883c6ad2908618a7a13ab386db831bfc SHA512 
7717d340c6de11afd589234b7ec8952fe2ffcd05829622bd7ea8e008870c0e3b83eb1eaf20e85a7adafc9c0c0b94fd93784510792109240e22e6b963f198
 WHIRLPOOL 
645b08ff0c20994b17b8ed585fb0eef682336961d7fedf25031fa4dc89a4d9a2b58c254e0f9baeedcb228435316fdfb562f9fefd21e5a63f94499d2f1040e093
 DIST systemd.conf.m4-v219 1493 SHA256 
90ee489b6e34945e5cda27a269e1247644382084f5a145a2df691282007c6768 SHA512 
a117c40229af3ba2a0cec4c3db01728c3cab49bb6403fc84cb34f8a09979d98f7a200cd28bf2bbc7a71cbad856edf31190fba30a9d5810c55911746457bbf31a
 WHIRLPOOL 

  1   2   >