gentoo resync : 14.04.2018

6 files changed, 2 insertions, 259 deletions

diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index e8f9f11ef38e..4f45b318764b 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,11 +1,5 @@
 AUX xxdiff-4.0.1-no-throw-in-dtor.patch 667 BLAKE2B 9543b6dbd0cfffd309298a100717477303b4d8342156896bba54fc6b9de70f37209aaa4d20c990d2353ab89a7c399078741f76ccb72cb8c2c2ac9855ac6f3486 SHA512 254961c7a3baced5f9dafdb71583145de4d8fccbc49ffb13568bf7414326ee3811389f38b1ac290f67867eebf0b724f5cdd776deab8b3f850847e1783bbf085f
 AUX xxdiff-4.0.1_p20170622-cxx11.patch 361 BLAKE2B e8f55fcd8f1564449cedc14df4339e1787391b8b3b6b7594b763d4c8189d858e0a9e41e5881ce2959e643480e6eee9cff348b83ee3968ee2fd9a751cdcb6088b SHA512 ef69f4a84a1a3f57f5ff435e0e863152c949a5faf9010c56bfd3b8455caac98fed1373f8a36d199eef6632d4a9e75ea58b965b9b5cd74ac4386a05a2cb9838a0
-AUX xxdiff-4.0_beta1_p20110426-bison3.patch 3243 BLAKE2B 407c66b6b29eb38b7be66753012aa94cf8229596a63b5f3265d59407d2cdf45fc536d909bf99aee0d33c636288f8eb7990307fa2dab01eaad490551df93cc0cb SHA512 179b57f579cc0ef20d3b391b9120726c44549c363fb6a0d88528a6e0bcf256d144fce99d44bbd5510fc42c5a8aea8b4a9ffea6aeb0a667a15b89af0e51893832
-AUX xxdiff-4.0_beta1_p20110426-gcc47.patch 631 BLAKE2B 3c686ab01fbdfcf4b0f9f7230ef0036ef3730a8bea5125a7e00e831212f59017a7e28e6447cde98715344148f2f4c7924f1876f2b0a8b0c5b4488ca54276fa3e SHA512 df3a4362d160cabdf3fb590965258b69d854ae3becef19d754932851e47d98d93869d666c41c11743d49cdc84222b2f0e819b119e2af8f7a3679e714bda13885
-DIST xxdiff-4.0.1.tar.bz2 1981869 BLAKE2B 637066e213327b7e79361f78d3ed7004023b282230b6ac077785519c93cb5c04a1192c06ec8a8ee86dc9db6c9e01fc5465edb13128e257b0409b11a43e4fe3cf SHA512 bcc2b528a0ebf273677d74aa3a971feb9052a01a8187a5d8abe3bce744520a3fa61bd842a9d4ba465abbf00f6da62868a1f18adeb7d8eccee6f76df4a1e4db3a
 DIST xxdiff-4.0.1_p20170622.tar.bz2 1983188 BLAKE2B b604c68902defca4caaa342123df165ca5ed4757254e7e696e637ff347298cdfd53324de6c21f65de4e0229ad7adb02434eb59e047590d2c71fb1f7e87e508d6 SHA512 a1b4cb26331b0bcc7ccdf3090ca4f1cf821c6819a189e4148cde0ef40e4377bf2b82627571ff05c066c3796e06cadc7c5ad040af0446c8f5bf48c25547564511
-DIST xxdiff-4.0_beta1_p20110426.tar.bz2 1770035 BLAKE2B 00c052c92cc0eb01f3072f4381e4fb18ebc0760c9a212a05573d958e3f444a02f07b856c6c326c234c82a8c7e315ac23f14d1bc3f53764983cd6c836accfeeed SHA512 d0be7a5775ed90aa1ac73320144aa24947c1bcc305bbb8f95c64009990dc44b96fd05abd7dc3f69c3a74fb93632099f4a40c76029ed29949854c5f3d7a890097
-EBUILD xxdiff-4.0.1-r1.ebuild 1137 BLAKE2B 7f48690258560661bd46ce42c7d1f0a0b231b5c2d0d80d11f4525cbdfc4aaf5d7e22c4c46a8886a817946ece48ab04331b0a7ad293923da041448a34087b1e84 SHA512 af5bfc98af1cfe73327718b352335379e0e07c20c8814a6e13b3009a590a6cb9b5bfd395da0a1e51ec2793c13a05c8ac31ed5c3d5b9c3cdcf4e89de87387fbe3
-EBUILD xxdiff-4.0.1_p20170622.ebuild 1250 BLAKE2B 188de43a829ba09a04c8e275317477be1d33fdd6adb500e8982836f5e37c58d8d6a076cd2f8be80119ac7cb2d19b516543a60cec1df193a6288a52e846d6bcf2 SHA512 a796087327a70bbe6f68880dd3832082c99b4d80a2200396e4547b14cc8c787458f481840d6114e531b1f0bb5843e220535c6dde01ccf15d8fafe151b56dac38
-EBUILD xxdiff-4.0_beta1_p20110426-r1.ebuild 1154 BLAKE2B 4b7d0ba77a0f0993707ed586400ae1b22a428fa9bfb45435232090bc67f67ad006ebcb35cb55a7b1ba8acc9b6f605ece580588bc124a207c34de85b999814c42 SHA512 2f538add6f3e640a6b329f57ebd6dba113acd6792c935f6bf8907a8a23b3934f623d4c05d12f6305b668637e84d10b34fec847735e0743e4991d1de9ae911964
+EBUILD xxdiff-4.0.1_p20170622.ebuild 1249 BLAKE2B 90dbc2261d04e017fcf4a251c2964483da5e31cb2215ffb43b9971a0c377eeca3b62460d67521ba0594a78af98bd9106e358c4af9c6af5ed370d7d28993482dc SHA512 9b68deff4c16d1b76c1161a23a656dea72b0622bc9fd7b0679e751e1efcdf10748d41cfb3eb27df3c872123b082947fb4dc290c2f3653244a108a9f4ce88757d
 MISC metadata.xml 435 BLAKE2B e8dcecbe49cd65c7b3ca119b141b7ac1d971be54d9a2b5fa63d25affaa2eb06f5eac261b004e33808e1ae6c735b131b37eee9380746d192a2aacfb81e49b132f SHA512 2ed2dc743bf4787b8a10c379ec52d84b8b76305f1b80b85da3b7c44ad5e3642673e34f9159d7804bb0780ef8a31d49d121c04c885d524253ab0e8ebde04136ed
diff --git a/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-bison3.patch b/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-bison3.patch
deleted file mode 100644
index fba71996b217..000000000000
--- a/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-bison3.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-http://bugs.gentoo.org/511560
-
-Description: Fix compilation with Bison 3
-YYPARSE_PARAM was deprecated in Bison 1.875 and removed in Bison 3;
-%parse-param can be used instead. Also fix a warning about %pure_parser
-Author: Florian Schlichting <fsfs@debian.org>
-
---- a/src/resParser.y
-+++ b/src/resParser.y
-@@ -39,12 +39,11 @@
- 
- // The parser input is the resources object to fill in.
- #define RESOURCES  ( static_cast<XxResources*>(resources) )
--#define YYPARSE_PARAM resources
- 
- // Declare lexer from other compilation unit.
- int resParserlex( YYSTYPE* yylval );
- 
--void resParsererror( const char* msg );
-+void resParsererror( void *resources, const char* msg );
- 
- // Declare some parser functions and data defined in resParser.cpp
- namespace XxResParserNS {
-@@ -58,6 +57,9 @@
- 
- %}
- 
-+/* The parser input is the resources object to fill in. */
-+%parse-param { void *resources }
-+
- /* generate header file */
- %defines
- 
-@@ -144,7 +146,7 @@
- %type <num> boolkwd
- 
- %start xxdiffrc
--%pure_parser
-+%pure-parser
- 
- %%
- xxdiffrc	: stmts
-@@ -188,7 +190,7 @@
-                       RESOURCES->setPreferredGeometry( geometry );
-                    }
-                    else {
--                      yyerror( "Bad geometry specification." );
-+                      yyerror( resources, "Bad geometry specification." );
-                       // Should never happen, the lexer regexp should be tough
-                       // enough.
-                    }
-@@ -212,7 +214,7 @@
-                       QString err = QString( "Requested style key does not exist." );
-                       err += QString( "\nValid styles are: " );
-                       err += styles.join( ", " );
--                      yyerror( err.toLatin1().constData() );
-+                      yyerror( resources, err.toLatin1().constData() );
-                    }
-                 }
-                 ;
-@@ -224,7 +226,7 @@
-                       char buf[2048];
-                       ::snprintf( buf, 2048,
-                                   "Unrecognized accelerator: %s\n", $5 );
--                      yyerror( buf );
-+                      yyerror( resources, buf );
-                    }
-                 }
- 		;
---- a/src/resParser.l
-+++ b/src/resParser.l
-@@ -298,7 +298,7 @@
-                      QString os;
-                      QTextOStream oss( &os );
-                      oss << "ignoring char: " << yytext << flush;
--                     yyerror( os.latin1() );
-+                     yyerror( resources, os.latin1() );
-                      */
-                   }
-                 }
---- a/src/resParser.cpp
-+++ b/src/resParser.cpp
-@@ -73,7 +73,7 @@
- 
- //------------------------------------------------------------------------------
- //
--void resParsererror( const char* msg )
-+void resParsererror( void* resources __attribute__((__unused__)), const char* msg )
- {
-    // Send errors to stdout so we can filter out the debug info shmeglu while
-    // debugging parser.
-@@ -794,7 +794,7 @@
-       QString os;
-       QTextStream oss( &os );
-       oss << "Unknown " << errmsg << ": " << name << flush;
--      resParsererror( os.toLatin1().constData() );
-+      resParsererror( NULL, os.toLatin1().constData() );
-    }
-    num = ERROR_TOKEN;
-    return ERROR_TOKEN;
diff --git a/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch b/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch
deleted file mode 100644
index 2dcea00bcba2..000000000000
--- a/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=442302
-
-# HG changeset patch
-# User Martin Blais <mblais@marketfactory.com>
-# Date 1339464558 14400
-# Node ID 00d868ea5f4a92f4b5c7e2665403eb18c7390aca
-# Parent  fdc247a7d9e51ca71b284f592be33f0465140f6b
-Fixed compile error that only shows up in FC17 with gcc-4.7.
-
-diff -r fdc247a7d9e5 -r 00d868ea5f4a src/main.h
---- a/src/main.h	Mon Feb 20 10:46:22 2012 -0500
-+++ b/src/main.h	Mon Jun 11 21:29:18 2012 -0400
-@@ -35,6 +35,10 @@
-  * PUBLIC DECLARATIONS
-  *============================================================================*/
- 
-+extern "C" {
-+
- extern char** environ;
- 
-+}
-+
- #endif
-
diff --git a/dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild
deleted file mode 100644
index 253a5704bce6..000000000000
--- a/dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils qt4-r2
-
-DESCRIPTION="A graphical file and directories comparator and merge tool"
-HOMEPAGE="http://furius.ca/xxdiff/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	virtual/yacc"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-throw-in-dtor.patch
-	pushd src >/dev/null
-	sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019
-	qt4-r2_src_prepare
-	popd
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	pushd src >/dev/null
-	qt4-r2_src_configure
-	cat Makefile.extra >> Makefile
-	popd
-
-	distutils-r1_src_configure
-}
-
-src_compile() {
-	pushd src >/dev/null
-	qt4-r2_src_compile
-	popd
-
-	distutils-r1_src_compile
-}
-
-src_install() {
-	dobin bin/xxdiff
-
-	distutils-r1_src_install
-
-	dodoc CHANGES README* TODO doc/*.txt src/doc.txt
-
-	dohtml doc/*.{png,html} src/doc.html
-
-	# example tools, use these to build your own ones
-	insinto /usr/share/doc/${PF}
-	doins -r tools
-}
diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
index c522c9c842f8..fc8ccfa8156b 100644
--- a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild
deleted file mode 100644
index ead20c6c3297..000000000000
--- a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils qt4-r2
-
-DESCRIPTION="A graphical file and directories comparator and merge tool"
-HOMEPAGE="http://furius.ca/xxdiff/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
-	virtual/yacc"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc47.patch \
-		"${FILESDIR}"/${P}-bison3.patch
-
-	pushd src >/dev/null
-	sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019
-	qt4-r2_src_prepare
-	popd
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	pushd src >/dev/null
-	qt4-r2_src_configure
-	cat Makefile.extra >> Makefile
-	popd
-
-	distutils-r1_src_configure
-}
-
-src_compile() {
-	pushd src >/dev/null
-	qt4-r2_src_compile
-	popd
-
-	distutils-r1_src_compile
-}
-
-src_install() {
-	dobin bin/xxdiff
-
-	distutils-r1_src_install
-
-	dodoc CHANGES README* TODO doc/*.txt src/doc.txt
-
-	dohtml doc/*.{png,html} src/doc.html
-
-	# example tools, use these to build your own ones
-	insinto /usr/share/doc/${PF}
-	doins -r tools
-}