From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- dev-util/xxdiff/Manifest | 1 + .../files/xxdiff-4.0_beta1_p20110426-bison3.patch | 100 +++++++++++++++++++++ .../files/xxdiff-4.0_beta1_p20110426-gcc47.patch | 24 +++++ dev-util/xxdiff/metadata.xml | 5 ++ .../xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild | 66 ++++++++++++++ dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild | 65 ++++++++++++++ 6 files changed, 261 insertions(+) create mode 100644 dev-util/xxdiff/Manifest create mode 100644 dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-bison3.patch create mode 100644 dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch create mode 100644 dev-util/xxdiff/metadata.xml create mode 100644 dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild create mode 100644 dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild (limited to 'dev-util/xxdiff') diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest new file mode 100644 index 000000000000..a866cc983446 --- /dev/null +++ b/dev-util/xxdiff/Manifest @@ -0,0 +1 @@ +DIST xxdiff-4.0_beta1_p20110426.tar.bz2 1770035 SHA256 70718eeb26e8880e2cda06d7ff6fe2e3fa9ea407086086f70ec1eb0e32301afe SHA512 d0be7a5775ed90aa1ac73320144aa24947c1bcc305bbb8f95c64009990dc44b96fd05abd7dc3f69c3a74fb93632099f4a40c76029ed29949854c5f3d7a890097 WHIRLPOOL 05048f3594d042f0130f0da20951bb124867ebfea55902bcabead5c8ba097fa4eb1f834b1f19b1ba7d36536f53240942414d143b3c4b6e0678909a5c4a5c6855 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 new file mode 100644 index 000000000000..fba71996b217 --- /dev/null +++ b/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-bison3.patch @@ -0,0 +1,100 @@ +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 + +--- 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(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 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 new file mode 100644 index 000000000000..2dcea00bcba2 --- /dev/null +++ b/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/show_bug.cgi?id=442302 + +# HG changeset patch +# User Martin Blais +# 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/metadata.xml b/dev-util/xxdiff/metadata.xml new file mode 100644 index 000000000000..dc439f7e84f5 --- /dev/null +++ b/dev-util/xxdiff/metadata.xml @@ -0,0 +1,5 @@ + + + +qt + diff --git a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild new file mode 100644 index 000000000000..e1dfd32949b0 --- /dev/null +++ b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 +} diff --git a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild new file mode 100644 index 000000000000..0128e520fb27 --- /dev/null +++ b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 + !>=sys-devel/bison-3" +DEPEND="${RDEPEND} + virtual/yacc" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc47.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 +} -- cgit v1.2.3-65-gdbad