summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-02-10 11:37:14 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-02-10 11:37:14 +0000
commite187bcd9692eb39f5afcc4f6cafcc30c58d5306d (patch)
tree45502085000e84a491efb4da3a7c34be8c0d780a /dev-java
parentRemove from main tree based on p.mask (no bug). (diff)
downloadgentoo-2-e187bcd9692eb39f5afcc4f6cafcc30c58d5306d.tar.gz
gentoo-2-e187bcd9692eb39f5afcc4f6cafcc30c58d5306d.tar.bz2
gentoo-2-e187bcd9692eb39f5afcc4f6cafcc30c58d5306d.zip
Remove from main tree based on p.mask (no bug).
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/qtjambi/ChangeLog134
-rw-r--r--dev-java/qtjambi/Manifest8
-rw-r--r--dev-java/qtjambi/files/ant180-4.5.2.patch195
-rw-r--r--dev-java/qtjambi/files/configuration-4.5.0_p1.patch107
-rw-r--r--dev-java/qtjambi/files/gcc4.4-4.5.0_p1.patch35
-rw-r--r--dev-java/qtjambi/files/generator-4.5.0_p1.patch29
-rw-r--r--dev-java/qtjambi/metadata.xml11
-rw-r--r--dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild173
8 files changed, 0 insertions, 692 deletions
diff --git a/dev-java/qtjambi/ChangeLog b/dev-java/qtjambi/ChangeLog
deleted file mode 100644
index 8895ebc31b7f..000000000000
--- a/dev-java/qtjambi/ChangeLog
+++ /dev/null
@@ -1,134 +0,0 @@
-# ChangeLog for dev-java/qtjambi
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.25 2010/05/19 14:27:28 caster Exp $
-
- 19 May 2010; Vlastimil Babka <caster@gentoo.org> qtjambi-4.5.2_p1.ebuild,
- +files/ant180-4.5.2.patch:
- Fix building with ant 1.8, bug #319597.
-
- 16 Feb 2010; Jonathan Callen <abcd@gentoo.org>
- -files/configuration-4.4.3.patch, -files/generator-4.4.3.patch:
- Drop old patches
-
- 03 Jan 2010; Ben de Groot <yngwin@gentoo.org> -qtjambi-4.4.3.ebuild,
- -qtjambi-4.5.0_p1.ebuild, qtjambi-4.5.2_p1.ebuild:
- Pin Qt deps on 4.5, bug 298269. Remove obsolete versions.
-
-*qtjambi-4.5.2_p1 (18 Dec 2009)
-
- 18 Dec 2009; Markos Chandras <hwoarang@gentoo.org>
- +qtjambi-4.5.2_p1.ebuild:
- Version bump ( bug #282365 )
-
- 09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
- -files/generator-4.3.3.patch, -files/jambi.pri.diff,
- -files/java_files_remove_accessibility.diff,
- -files/java_files_remove_ssl.diff, -files/qtjambi_base.pri.diff:
- Drop unneeded patches
-
- 19 Jul 2009; Dominik Kapusta <d@ayoy.net> qtjambi-4.5.0_p1.ebuild,
- +files/gcc4.4-4.5.0_p1.patch, +metadata.xml:
- Added patch allowing for compilation with gcc-4.4 (bug #278247) plus
- restored
- metadata.xml.
-
-*qtjambi-4.5.0_p1 (15 May 2009)
-
- 15 May 2009; Davide Pesavento <davidepesa@gmail.com>
- +qtjambi-4.5.0_p1.ebuild, +files/configuration-4.5.0_p1.patch,
- +files/generator-4.5.0_p1.patch, +metadata.xml:
- Version bump (bug #260774). Greatly improved ebuild, mostly rewritten by
- me. Also incorporated some nice additions by Kyle Cavin
- <kyle.cavin@gmail.com>.
-
- 07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
- -qtjambi-4.3.3_p1.ebuild:
- Remove old version.
-
- 04 Mar 2009; Alistair Bush <ali_bush@gentoo.org>
- files/configuration-4.4.3.patch:
- Update to correct configuration patch. Old patch must have been applied
- from bug #233840 instead of latest.
-
- 19 Jan 2009; Ben de Groot <yngwin@gentoo.org> qtjambi-4.4.3.ebuild:
- Fix qt dependency (nothing should depend on the meta ebuild)
-
- 25 Dec 2008; Alistair Bush <ali_bush@gentoo.org>
- +files/configuration-4.4.3.patch, +files/generator-4.4.3.patch:
- Adding patches I missed.
-
-*qtjambi-4.4.3 (24 Dec 2008)
-
- 24 Dec 2008; Alistair Bush <ali_bush@gentoo.org> metadata.xml,
- +qtjambi-4.4.3.ebuild:
- Version Bump qtjambi. Thanks to all the good work done by Fabian Koster
- <koesterreich@gmx.net> See #233840.
-
- 21 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
- -files/generator-4.3.2.patch, -qtjambi-4.3.2_p1.ebuild:
- Old.
-
- 25 Feb 2008; Caleb Tennis <caleb@gentoo.org> -files/generator-4.3.1.patch,
- -qtjambi-4.3.1_p1.ebuild:
- remove version no longer in portage
-
- 30 Dec 2007; Markus Ullmann <jokey@gentoo.org> qtjambi-4.3.3_p1.ebuild:
- Fix quoting
-
-*qtjambi-4.3.3_p1 (19 Dec 2007)
-
- 19 Dec 2007; Caleb Tennis <caleb@gentoo.org> +files/generator-4.3.3.patch,
- +qtjambi-4.3.3_p1.ebuild:
- version bump
-
- 23 Nov 2007; Samuli Suominen <drac@gentoo.org> qtjambi-4.3.2_p1.ebuild:
- Keyword ~amd64 wrt #197763.
-
- 23 Oct 2007; Caleb Tennis <caleb@gentoo.org> -files/generator.patch,
- -files/jambipropertysheet.diff, -files/qdesigner_utils_p.h,
- -files/shared_global_p.h, -qtjambi-4.3.0_p1-r2.ebuild:
- remove old versions
-
-*qtjambi-4.3.2_p1 (23 Oct 2007)
-
- 23 Oct 2007; Caleb Tennis <caleb@gentoo.org> +files/generator-4.3.2.patch,
- +qtjambi-4.3.2_p1.ebuild:
- Version bump
-
- 11 Aug 2007; Caleb Tennis <caleb@gentoo.org> +files/generator-4.3.1.patch,
- qtjambi-4.3.1_p1.ebuild:
- add generator patch fix
-
- 09 Aug 2007; Caleb Tennis <caleb@gentoo.org> -qtjambi-4.3.0_p1.ebuild,
- -qtjambi-4.3.0_p1-r1.ebuild:
- remove old files
-
-*qtjambi-4.3.1_p1 (09 Aug 2007)
-
- 09 Aug 2007; Caleb Tennis <caleb@gentoo.org> +qtjambi-4.3.1_p1.ebuild:
- Version bump
-
-*qtjambi-4.3.0_p1-r2 (18 Jun 2007)
-
- 18 Jun 2007; Caleb Tennis <caleb@gentoo.org> qtjambi-4.3.0_p1-r1.ebuild,
- +qtjambi-4.3.0_p1-r2.ebuild:
- Committing some ebuild fixes submitted by martin capitano.
-
- 08 Jun 2007; Caleb Tennis <caleb@gentoo.org> qtjambi-4.3.0_p1-r1.ebuild:
- Some more fixes to put stuff in the right locations
-
-*qtjambi-4.3.0_p1-r1 (08 Jun 2007)
-
- 08 Jun 2007; Caleb Tennis <caleb@gentoo.org> +qtjambi-4.3.0_p1-r1.ebuild:
- Bump, with some location changes
-
-*qtjambi-4.3.0_p1 (07 Jun 2007)
-
- 07 Jun 2007; Caleb Tennis <caleb@gentoo.org> +files/generator.patch,
- +files/jambi.pri.diff, +files/jambipropertysheet.diff,
- +files/java_files_remove_accessibility.diff,
- +files/java_files_remove_ssl.diff, +files/qdesigner_utils_p.h,
- +files/qtjambi_base.pri.diff, +files/shared_global_p.h, +metadata.xml,
- +qtjambi-4.3.0_p1.ebuild:
- Initial ebuild
-
diff --git a/dev-java/qtjambi/Manifest b/dev-java/qtjambi/Manifest
deleted file mode 100644
index 0721f6a8bfd2..000000000000
--- a/dev-java/qtjambi/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX ant180-4.5.2.patch 9642 RMD160 48a5a4583f3c2f54a853424fa950ee1b8c4b1192 SHA1 420bb2eda70d44970b4181d6b27112eed859664d SHA256 ff49395de312a829a2c4574cbd69f051e137493b7330f28355a41a61b6004dbf
-AUX configuration-4.5.0_p1.patch 3975 RMD160 4e3e32f4a9c02c977b3fe7416cb8e92ea48289dd SHA1 ab483d3122a5f98d10b321511de6794bd57f5885 SHA256 6fff370711c319a6e070569405172a27af039f1dcdd064d37bbfaf3261e5a0a5
-AUX gcc4.4-4.5.0_p1.patch 1108 RMD160 b0b54f12d32fcc47a4c8846ad2183dcfd0efa3fd SHA1 4c834eb9795fb1e09bd8fe349cc05db4d4caa900 SHA256 eb6669bc0937a3147a4089c9de376b4fc783ff093340453d461fbf08216b0bfe
-AUX generator-4.5.0_p1.patch 1352 RMD160 cdec9732e2a7d5421451b8e7e3e60de1c195fdee SHA1 9bfdca02dc220508ebe7255f8aff9780c99ed824 SHA256 80adfa473b386bcec10b861ba76759b3554167e3a81108b5e8d2d5ffc04d1e57
-DIST qtjambi-src-lgpl-4.5.2_01.tar.gz 4952790 RMD160 85070abfa33d530128b60c7377dde75f84a510b8 SHA1 7d144a280ae7ea3cfa2ef1edde43097a0c19c9db SHA256 1ce66dc56a633ee54c47a4ce3dc4939fd0bd04fd2726a4d85a28727ceee669e6
-EBUILD qtjambi-4.5.2_p1.ebuild 5095 RMD160 e2288f2974ea15bed615bea53d976df6769a2d5a SHA1 37dbc0fe286b818657482a251e31585e44e34ca2 SHA256 3d87362bc4f8ea69527c940db26b91363cfde47de8e16cf70de2884818aa8a3c
-MISC ChangeLog 4684 RMD160 d49af744c5452780bbdb98d2fc9ce07888aa6b84 SHA1 0077e6311cec11162a56ea377085289d7adf5843 SHA256 1e6fa6699aedac143457123f328f4c14913eb216d52014a89bdb19f66d6331c0
-MISC metadata.xml 374 RMD160 554c518b96dd5681f778395c1888891649e6ed55 SHA1 ae068aac6ddef644ebcd32899ec79e6bcc879282 SHA256 5e303995da64782af3b8e13149e0d4ba849fdd84c4967ac4a429b12e5a9ac50f
diff --git a/dev-java/qtjambi/files/ant180-4.5.2.patch b/dev-java/qtjambi/files/ant180-4.5.2.patch
deleted file mode 100644
index 966055dcdd75..000000000000
--- a/dev-java/qtjambi/files/ant180-4.5.2.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-diff --git a/com/trolltech/tools/ant/InitializeTask.java b/com/trolltech/tools/ant/InitializeTask.java
-index 7872328..14a470c 100755
---- a/com/trolltech/tools/ant/InitializeTask.java
-+++ b/com/trolltech/tools/ant/InitializeTask.java
-@@ -145,14 +145,14 @@ public class InitializeTask extends Task {
-
- public void execute() throws BuildException {
- props = PropertyHelper.getPropertyHelper(getProject());
-- props.setNewProperty(null, OSNAME, decideOSName());
-- props.setNewProperty(null, LIBSUBDIR, decideLibSubDir());
-- props.setNewProperty(null, QTDIR, decideQtDir());
-+ props.setNewProperty((String)null, OSNAME, decideOSName());
-+ props.setNewProperty((String)null, LIBSUBDIR, decideLibSubDir());
-+ props.setNewProperty((String)null, QTDIR, decideQtDir());
-
- // TODO: Find a better way to get a hold of version...
-- props.setNewProperty(null, VERSION, Version.STRING);
-+ props.setNewProperty((String)null, VERSION, Version.STRING);
-
-- props.setNewProperty(null, COMPILER, decideCompiler());
-+ props.setNewProperty((String)null, COMPILER, decideCompiler());
-
- checkCompilerDetails();
-
-@@ -168,43 +168,43 @@ public class InitializeTask extends Task {
- }
- }
-
-- props.setNewProperty(null, CONFIGURATION, decideConfiguration());
-+ props.setNewProperty((String)null, CONFIGURATION, decideConfiguration());
-
- // These depend on both qtdir, libsubdir and configration, so
- // run rather late...
- String phonon = decidePhonon();
- if ("true".equals(phonon)) {
-- props.setNewProperty(null, PHONON, phonon);
-+ props.setNewProperty((String)null, PHONON, phonon);
- switch (OSInfo.os()) {
- case Windows:
-- props.setNewProperty(null, PHONON_DS9, "true");
-+ props.setNewProperty((String)null, PHONON_DS9, "true");
- break;
- case Linux:
-- props.setNewProperty(null, PHONON_GSTREAMER, "true");
-+ props.setNewProperty((String)null, PHONON_GSTREAMER, "true");
- if (doesQtLibExist("QtDBus", 4))
-- props.setNewProperty(null, DBUS, "true");
-+ props.setNewProperty((String)null, DBUS, "true");
- break;
- case MacOS:
-- props.setNewProperty(null, PHONON_QT7, "true");
-+ props.setNewProperty((String)null, PHONON_QT7, "true");
- if (doesQtLibExist("QtDBus", 4))
-- props.setNewProperty(null, DBUS, "true");
-+ props.setNewProperty((String)null, DBUS, "true");
- break;
- }
- }
-
-- props.setNewProperty(null, SQLITE, decideSqlite());
-+ props.setNewProperty((String)null, SQLITE, decideSqlite());
-
- String webkit = decideWebkit();
- if ("true".equals(webkit) && "true".equals(phonon))
-- props.setNewProperty(null, WEBKIT, webkit);
-+ props.setNewProperty((String)null, WEBKIT, webkit);
-
- String patterns = decideXMLPatterns();
- if ("true".equals(patterns))
-- props.setNewProperty(null, XMLPATTERNS, patterns);
-+ props.setNewProperty((String)null, XMLPATTERNS, patterns);
-
- String opengl = decideOpenGL();
- if ("true".equals(opengl))
-- props.setNewProperty(null, OPENGL, opengl);
-+ props.setNewProperty((String)null, OPENGL, opengl);
- }
-
- private void checkCompilerDetails() {
-@@ -216,7 +216,7 @@ public class InitializeTask extends Task {
- String vcdir = System.getenv("VSINSTALLDIR");
- if (vcdir == null)
- throw new BuildException("missing required environment variable 'VSINSTALLDIR' used to locate MSVC redistributables");
-- props.setNewProperty(null, VSINSTALLDIR, vcdir);
-+ props.setNewProperty((String)null, VSINSTALLDIR, vcdir);
-
- String redistDir;
- if (compiler == Compiler.MSVC2005_64 || compiler == Compiler.MSVC2008_64)
-@@ -225,7 +225,7 @@ public class InitializeTask extends Task {
- redistDir = vcdir + "/vc/redist/x86";
- if (!new File(redistDir).exists())
- throw new BuildException("MSVC redistributables not found in '" + redistDir + "'");
-- props.setNewProperty(null, VSREDISTDIR, redistDir);
-+ props.setNewProperty((String)null, VSREDISTDIR, redistDir);
-
- break;
- }
-@@ -365,7 +365,7 @@ public class InitializeTask extends Task {
-
- private boolean doesQtLibExist(String name, int version) {
- StringBuilder path = new StringBuilder();
-- path.append(props.getProperty(null, QTDIR));
-+ path.append(props.getProperty((String)null, QTDIR));
- path.append("/");
- path.append(LibraryEntry.formatQtName(name, debug, version));
- return new File(path.toString()).exists();
-@@ -373,7 +373,7 @@ public class InitializeTask extends Task {
-
- private boolean doesQtPluginExist(String name, String subdir) {
- StringBuilder path = new StringBuilder();
-- path.append(props.getProperty(null, QTDIR));
-+ path.append(props.getProperty((String)null, QTDIR));
- path.append("/plugins/");
- path.append(subdir);
- path.append("/");
-diff --git a/com/trolltech/tools/ant/LibraryEntry.java b/com/trolltech/tools/ant/LibraryEntry.java
-index 575ef0b..d84d409 100755
---- a/com/trolltech/tools/ant/LibraryEntry.java
-+++ b/com/trolltech/tools/ant/LibraryEntry.java
-@@ -129,11 +129,11 @@ public class LibraryEntry extends Task {
-
- PropertyHelper h = PropertyHelper.getPropertyHelper(getProject());
-
-- boolean debug = "debug".equals(h.getProperty(null, InitializeTask.CONFIGURATION));
-+ boolean debug = "debug".equals(h.getProperty((String)null, InitializeTask.CONFIGURATION));
-
- // Change subdir...
- if (subdir.equals("auto"))
-- subdir = (String) h.getProperty(null, InitializeTask.LIBSUBDIR);
-+ subdir = (String) h.getProperty((String)null, InitializeTask.LIBSUBDIR);
-
- // Fix name...
- if (type.equals(TYPE_PLUGIN)) name = formatPluginName(name, debug);
-diff --git a/com/trolltech/tools/ant/MakeTask.java b/com/trolltech/tools/ant/MakeTask.java
-index 6211cb3..3046107 100755
---- a/com/trolltech/tools/ant/MakeTask.java
-+++ b/com/trolltech/tools/ant/MakeTask.java
-@@ -60,7 +60,7 @@ public class MakeTask extends Task {
- switch(OSInfo.os()){
- case Windows:
- PropertyHelper props = PropertyHelper.getPropertyHelper(getProject());
-- String compiler = (String) props.getProperty(null, InitializeTask.COMPILER);
-+ String compiler = (String) props.getProperty((String)null, InitializeTask.COMPILER);
- if (compiler.equals(InitializeTask.Compiler.MinGW.toString())) {
- return "mingw32-make";
- }
-diff --git a/com/trolltech/tools/ant/PlatformJarTask.java b/com/trolltech/tools/ant/PlatformJarTask.java
-index 25fdeb6..9c1f6ac 100755
---- a/com/trolltech/tools/ant/PlatformJarTask.java
-+++ b/com/trolltech/tools/ant/PlatformJarTask.java
-@@ -107,7 +107,7 @@ public class PlatformJarTask extends Task {
- public void execute_internal() throws BuildException {
- props = PropertyHelper.getPropertyHelper(getProject());
-
-- debugConfiguration = "debug".equals(props.getProperty(null, InitializeTask.CONFIGURATION));
-+ debugConfiguration = "debug".equals(props.getProperty((String)null, InitializeTask.CONFIGURATION));
-
- if (outdir == null)
- throw new BuildException("Missing required attribute 'outdir'. This directory is used for building the .jar file...");
-@@ -148,7 +148,7 @@ public class PlatformJarTask extends Task {
- }
-
- writer.println("<qtjambi-deploy"
-- + " system=\"" + props.getProperty(null, InitializeTask.OSNAME).toString()
-+ + " system=\"" + props.getProperty((String)null, InitializeTask.OSNAME).toString()
- + "\">");
- writer.println("\n <cache key=\"" + cacheKey + "\" />");
-
-@@ -237,7 +237,7 @@ public class PlatformJarTask extends Task {
-
-
- private void processSystemLibs() {
-- String compiler = String.valueOf(props.getProperty(null, InitializeTask.COMPILER));
-+ String compiler = String.valueOf(props.getProperty((String)null, InitializeTask.COMPILER));
- InitializeTask.Compiler c = InitializeTask.Compiler.resolve(compiler);
-
- String vcnumber = "80";
-@@ -256,7 +256,7 @@ public class PlatformJarTask extends Task {
- break;
- }
-
-- File crt = new File(props.getProperty(null, InitializeTask.VSREDISTDIR).toString(),
-+ File crt = new File(props.getProperty((String)null, InitializeTask.VSREDISTDIR).toString(),
- "Microsoft.VC" + vcnumber + ".CRT");
-
- String files[] = new String[] { "Microsoft.VC" + vcnumber + ".CRT.manifest",
-@@ -330,7 +330,7 @@ public class PlatformJarTask extends Task {
- throw new BuildException("Runtime library '" + name + "' was not found in library path...");
- }
-
-- String libDir = props.getProperty(null, InitializeTask.LIBSUBDIR).toString();
-+ String libDir = props.getProperty((String)null, InitializeTask.LIBSUBDIR).toString();
-
- try {
- Util.copy(rt, new File(outdir, libDir + "/" + name));
diff --git a/dev-java/qtjambi/files/configuration-4.5.0_p1.patch b/dev-java/qtjambi/files/configuration-4.5.0_p1.patch
deleted file mode 100644
index 134c4b683d74..000000000000
--- a/dev-java/qtjambi/files/configuration-4.5.0_p1.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -Naur qtjambi-src-preview-4.5.0_01~orig/build.xml qtjambi-src-preview-4.5.0_01/build.xml
---- qtjambi-src-preview-4.5.0_01~orig/build.xml 2009-05-01 14:37:12.000000000 +0200
-+++ qtjambi-src-preview-4.5.0_01/build.xml 2009-05-01 14:40:17.000000000 +0200
-@@ -293,8 +293,7 @@
- </target>
-
- <target name="library.designer.bundle"
-- depends="library.designer.compile"
-- unless="qtjambi.library.cppfiles.uptodate">
-+ depends="library.designer.compile">
- <jar destfile="${outputDir}/qtjambi-designer-${qtjambi.version}.jar"
- basedir="${outputDir}">
- <include name="com/trolltech/tools/designer/*"/>
-@@ -593,7 +592,9 @@
- <target name="init"
- depends="init.ant, init.taskdef"
- description="Initializes the Qt Jambi build environment." >
-- <qtjambi-initialize verbose="true" configuration="${qtjambi.config}" />
-+ <qtjambi-initialize verbose="true" configuration="${qtjambi.config}"
-+ opengl="${gentoo.opengl}" phonon="${gentoo.phonon}"
-+ webkit="${gentoo.webkit}" xmlpatterns="${gentoo.xmlpatterns}"/>
- </target>
-
- <target name="generator"
-diff -Naur qtjambi-src-preview-4.5.0_01~orig/com/trolltech/tools/ant/InitializeTask.java qtjambi-src-preview-4.5.0_01/com/trolltech/tools/ant/InitializeTask.java
---- qtjambi-src-preview-4.5.0_01~orig/com/trolltech/tools/ant/InitializeTask.java 2009-05-01 14:37:11.000000000 +0200
-+++ qtjambi-src-preview-4.5.0_01/com/trolltech/tools/ant/InitializeTask.java 2009-05-01 14:44:57.000000000 +0200
-@@ -105,6 +105,22 @@
- return configuration;
- }
-
-+ public void setOpengl(String opengl) {
-+ this.opengl = opengl;
-+ }
-+
-+ public void setPhonon(String phonon) {
-+ this.phonon = phonon;
-+ }
-+
-+ public void setWebkit(String webkit) {
-+ this.webkit = webkit;
-+ }
-+
-+ public void setXmlpatterns(String xmlpatterns) {
-+ this.xmlpatterns = xmlpatterns;
-+ }
-+
- public void execute() throws BuildException {
- props = PropertyHelper.getPropertyHelper(getProject());
- props.setNewProperty(null, OSNAME, decideOSName());
-@@ -301,7 +317,7 @@
- }
-
- private String decideLibSubDir() {
-- libSubDir = OSInfo.os() == OSInfo.OS.Windows ? "bin" : "lib";
-+ libSubDir = "";
- if (verbose) System.out.println("qtjambi.libsubdir: " + libSubDir);
- return libSubDir;
- }
-@@ -330,8 +346,6 @@
- StringBuilder path = new StringBuilder();
- path.append(props.getProperty(null, QTDIR));
- path.append("/");
-- path.append(props.getProperty(null, LIBSUBDIR));
-- path.append("/");
- path.append(LibraryEntry.formatQtName(name, debug, version));
- return new File(path.toString()).exists();
- }
-@@ -353,25 +367,25 @@
- }
-
- private String decidePhonon() {
-- String result = String.valueOf(doesQtLibExist("phonon", 4));
-+ String result = phonon;
- if (verbose) System.out.println(PHONON + ": " + result);
- return result;
- }
-
- private String decideWebkit() {
-- String result = String.valueOf(doesQtLibExist("QtWebKit", 4));
-+ String result = webkit;
- if (verbose) System.out.println(WEBKIT + ": " + result);
- return result;
- }
-
- private String decideXMLPatterns() {
-- String result = String.valueOf(doesQtLibExist("QtXmlPatterns", 4));
-+ String result = xmlpatterns;
- if (verbose) System.out.println(XMLPATTERNS + ": " + result);
- return result;
- }
-
- private String decideOpenGL() {
-- String result = String.valueOf(doesQtLibExist("QtOpenGL", 4));
-+ String result = opengl;
- if (verbose) System.out.println(OPENGL + ": " + result);
- return result;
- }
-@@ -385,4 +399,8 @@
- private String qmakespec;
- private String qtdir;
- private String libSubDir;
-+ private String opengl;
-+ private String phonon;
-+ private String webkit;
-+ private String xmlpatterns;
- }
diff --git a/dev-java/qtjambi/files/gcc4.4-4.5.0_p1.patch b/dev-java/qtjambi/files/gcc4.4-4.5.0_p1.patch
deleted file mode 100644
index 564ae718ac6e..000000000000
--- a/dev-java/qtjambi/files/gcc4.4-4.5.0_p1.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- qtjambi-src-lgpl-4.5.0_01.orig/juic/javautils.cpp 2009-07-19 19:17:42.000000000 +0200
-+++ qtjambi-src-lgpl-4.5.0_01/juic/javautils.cpp 2009-07-19 19:10:17.000000000 +0200
-@@ -43,6 +43,8 @@
- #include "javautils.h"
- #include <QtCore/QHash>
-
-+#include <cstdio>
-+
- QString javaFixString(const QString &str)
- {
- const ushort *chars = str.utf16();
---- qtjambi-src-lgpl-4.5.0_01.orig/generator/parser/rpp/pp-internal.h 2009-07-19 19:17:42.000000000 +0200
-+++ qtjambi-src-lgpl-4.5.0_01/generator/parser/rpp/pp-internal.h 2009-07-19 19:10:17.000000000 +0200
-@@ -46,6 +46,8 @@
-
- #include <algorithm>
-
-+#include <cstdio>
-+
- namespace rpp {
-
- namespace _PP_internal
---- qtjambi-src-lgpl-4.5.0_01.orig/qtjambi/qtjambitypemanager.cpp 2009-07-19 19:17:42.000000000 +0200
-+++ qtjambi-src-lgpl-4.5.0_01/qtjambi/qtjambitypemanager.cpp 2009-07-19 19:10:18.000000000 +0200
-@@ -637,8 +637,8 @@
- jvalue returned;
- returned.l = 0;
-
-- char *methodName;
-- char *signature;
-+ const char *methodName;
-+ const char *signature;
- switch (typeId) {
- case Integer:
- methodName = "intValue";
diff --git a/dev-java/qtjambi/files/generator-4.5.0_p1.patch b/dev-java/qtjambi/files/generator-4.5.0_p1.patch
deleted file mode 100644
index fd7a4a4c3de7..000000000000
--- a/dev-java/qtjambi/files/generator-4.5.0_p1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur qtjambi-src-preview-4.5.0_01.orig/generator/main.h qtjambi-src-preview-4.5.0_01/generator/main.h
---- qtjambi-src-preview-4.5.0_01.orig/generator/main.h 2009-02-10 12:44:47.000000000 +0100
-+++ qtjambi-src-preview-4.5.0_01/generator/main.h 2009-02-25 22:57:37.000000000 +0100
-@@ -68,18 +68,13 @@
- includes += commandLineIncludes.split(path_splitter);
-
- // Include Qt
-- QString qtdir = getenv ("QTDIR");
-- if (qtdir.isEmpty()) {
-- qWarning("QTDIR environment variable not set. This may cause problems with finding the necessary include files.");
-- } else {
-- qtdir += "/include";
-- includes << (qtdir + "/QtXml");
-- includes << (qtdir + "/QtNetwork");
-- includes << (qtdir + "/QtCore");
-- includes << (qtdir + "/QtGui");
-- includes << (qtdir + "/QtOpenGL");
-- includes << qtdir;
-- }
-+ QString qtdir = "/usr/include/qt4";
-+ includes << (qtdir + "/QtXml");
-+ includes << (qtdir + "/QtNetwork");
-+ includes << (qtdir + "/QtCore");
-+ includes << (qtdir + "/QtGui");
-+ includes << (qtdir + "/QtOpenGL");
-+ includes << qtdir;
-
- foreach (QString include, includes)
- preprocess.push_include_path(QDir::convertSeparators(include).toStdString());
diff --git a/dev-java/qtjambi/metadata.xml b/dev-java/qtjambi/metadata.xml
deleted file mode 100644
index e5d6f265cd54..000000000000
--- a/dev-java/qtjambi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>qt</herd>
- <herd>java</herd>
- <use>
- <flag name="phonon">Enable bindings to QT Phonon</flag>
- <flag name="webkit">Enable bindings to QT Webkit</flag>
- <flag name="xmlpatterns">Enable bindings to QT xmlpatterns</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild b/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild
deleted file mode 100644
index df34b4f3d2b9..000000000000
--- a/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild,v 1.3 2010/05/19 14:27:29 caster Exp $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-trax"
-
-inherit multilib qt4-r2 java-pkg-2 java-ant-2
-
-QTVER="${PV%.*}*"
-MY_PV="${PV/p/0}"
-MY_P="${PN}-src-lgpl-${MY_PV}"
-
-DESCRIPTION="QtJambi is a set of Java bindings and utilities for the Qt C++ toolkit."
-HOMEPAGE="http://qt.nokia.com/"
-SRC_URI="http://get.qt.nokia.com/${PN}/source/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug examples opengl phonon webkit xmlpatterns"
-
-COMMON_DEPS="=x11-libs/qt-gui-${QTVER}:${SLOT}
- =x11-libs/qt-sql-${QTVER}:${SLOT}
- =x11-libs/qt-svg-${QTVER}:${SLOT}
- opengl? ( =x11-libs/qt-opengl-${QTVER}:${SLOT} )
- phonon? ( =x11-libs/qt-phonon-${QTVER}:${SLOT} )
- webkit? (
- =x11-libs/qt-phonon-${QTVER}:${SLOT}
- =x11-libs/qt-webkit-${QTVER}:${SLOT}
- )
- xmlpatterns? ( =x11-libs/qt-xmlpatterns-${QTVER}:${SLOT} )"
-DEPEND="${COMMON_DEPS}
- >=virtual/jdk-1.6"
-RDEPEND="${COMMON_DEPS}
- >=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/generator-4.5.0_p1.patch \
- "${FILESDIR}"/configuration-4.5.0_p1.patch \
- "${FILESDIR}"/gcc4.4-4.5.0_p1.patch \
- "${FILESDIR}"/ant180-4.5.2.patch
-
- # Respect MAKEOPTS
- sed -i -e "/String arguments =/s|=.*|=\" ${MAKEOPTS}\";|" \
- com/trolltech/tools/ant/MakeTask.java || die
-
- java-ant_rewrite-classpath
-}
-
-qtjambi_use() {
- if [[ $1 == "phonon" ]] && use webkit; then
- # USE=webkit requires phonon support
- echo "-Dgentoo.phonon=true"
- else
- echo "-Dgentoo.$1=$(use $1 && echo true || echo false)"
- fi
-}
-
-qt_config_use() {
- if [[ $1 == "phonon" ]] && use webkit; then
- # USE=webkit requires phonon support
- echo "QT_CONFIG+=phonon"
- else
- echo "QT_CONFIG$(use $1 && echo '+' || echo '-')=$1"
- fi
-}
-
-src_compile() {
- local myconf="-Dqtjambi.config=$(use debug && echo debug || echo release)
- -Dlibrary.designer=true
- $(qtjambi_use opengl)
- $(qtjambi_use phonon)
- $(qtjambi_use webkit)
- $(qtjambi_use xmlpatterns)"
- export QTDIR="/usr/$(get_libdir)/qt4"
-
- einfo "Initializing Qt Jambi build environment"
- eant -Dgentoo.classpath="$(java-pkg_getjar --build-only ant-core ant.jar)" \
- ${myconf} init
-
- einfo "Merging XML files used by the Qt Jambi generator"
- eant ${myconf} generator.xmlmerge
-
- # Use eqmake4 instead of generator.qmake ant target
- eqmake4 generator/generator.pro -o generator/Makefile
-
- einfo "Building and running the generator"
- eant ${myconf} generator.run # implies generator.compile
-
- # Use eqmake4 instead of library.native.qmake ant target
- eqmake4 java.pro -recursive \
- $(qt_config_use opengl) \
- $(qt_config_use phonon) \
- $(qt_config_use webkit) \
- $(qt_config_use xmlpatterns)
-
- einfo "Building the native library"
- eant ${myconf} library.native.compile
-
- einfo "Building the Java library"
- eant ${myconf} library.java
-
- einfo "Building the Designer library"
- eant ${myconf} library.designer
-
- if use examples; then
- einfo "Building examples"
- eant ${myconf} examples
- fi
-
- # Build API documentation
- if use doc; then
- einfo "Generating Javadoc"
- javadoc -J-Xmx256m -d javadoc -subpackages com || die
- fi
-
- # Generate start script for jambi-designer
- cat > bin/jambi-designer <<-EOF
- #!/bin/sh
- export LD_LIBRARY_PATH="/usr/$(get_libdir)/qt4:/usr/$(get_libdir)/${PN}-${SLOT}:\${LD_LIBRARY_PATH}"
- export CLASSPATH="/usr/share/${PN}-${SLOT}/lib/${PN}.jar:/usr/share/${PN}-${SLOT}/lib/${PN}-designer.jar:\${CLASSPATH}"
- export QT_PLUGIN_PATH="/usr/$(get_libdir)/qt4/plugins"
- exec /usr/bin/designer "\$@"
- EOF
-}
-
-src_install() {
- dobin "${S}"/bin/* || die
- newbin "${S}"/generator/generator jambi-generator || die
-
- einfo "Installing jars"
- java-pkg_newjar qtjambi-${MY_PV}.jar
- java-pkg_newjar qtjambi-designer-${MY_PV}.jar ${PN}-designer.jar
- java-pkg_dojar ant-qtjambi.jar
-
- einfo "Installing native libraries"
- java-pkg_doso "${S}"/lib/*
-
- einfo "Installing designer plugins"
- exeinto /usr/$(get_libdir)/qt4/plugins/${PN}
- doexe plugins/designer/*.so || die
- # Designer needs these libraries in both directories
- dosym /usr/$(get_libdir)/qt4/plugins/${PN}/libJambiCustomWidget.so \
- /usr/$(get_libdir)/qt4/plugins/designer/libJambiCustomWidget.so
- dosym /usr/$(get_libdir)/qt4/plugins/${PN}/libJambiLanguage.so \
- /usr/$(get_libdir)/qt4/plugins/designer/libJambiLanguage.so
-
- if use doc; then
- einfo "Installing documentation"
- dohtml "${S}"/readme.html
- java-pkg_dojavadoc "${S}"/javadoc
- fi
-
- if use examples; then
- einfo "Installing examples"
-
- # Get rid of class files before installing
- find "${S}"/com/trolltech/examples -name '*.class' -delete || die
-
- java-pkg_newjar qtjambi-examples-${MY_PV}.jar ${PN}-examples.jar
- java-pkg_doexamples "${S}"/com/trolltech/examples
- java-pkg_dolauncher jambi-examples --main com.trolltech.launcher.Launcher \
- --java_args "-Djava.library.path=/usr/$(get_libdir)/qt4:/usr/$(get_libdir)/${PN}-${SLOT}"
- fi
-
- use source && java-pkg_dosrc "${S}"/com
-}