Added patch to make cpptasks work with profiling (bug #156596) and changed to use...

Package-Manager: portage-2.1.2-r9

diff --git a/dev-java/cpptasks/ChangeLog b/dev-java/cpptasks/ChangeLog
index 6969caa6e954d3921ca3dfb6fe2f6d89635d37a5..d35965ef3395903ea460385d16bc868732a1334a 100644 (file)
--- a/dev-java/cpptasks/ChangeLog
+++ b/dev-java/cpptasks/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/cpptasks
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cpptasks/ChangeLog,v 1.6 2006/12/20 23:30:36 betelgeuse Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cpptasks/ChangeLog,v 1.7 2007/02/10 12:43:51 betelgeuse Exp $
+
+*cpptasks-1.0_beta4-r1 (10 Feb 2007)
+
+  10 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/1.0b4-profiling.patch, +cpptasks-1.0_beta4-r1.ebuild:
+  Added patch to make cpptasks work with profiling (bug #156596) and changed
+  to use split ant features and latest eclass features. Thanks to Martijn
+  Hijdra <hijdra@imst.de> for the patch.
 
   20 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
   cpptasks-1.0_beta4.ebuild:

diff --git a/dev-java/cpptasks/Manifest b/dev-java/cpptasks/Manifest
index 128e8e8280cfa3565d5fabddcba8da00aa9fc9e6..9bbf44e7b36f413a35332bdce08be3935edb544e 100644 (file)
--- a/dev-java/cpptasks/Manifest
+++ b/dev-java/cpptasks/Manifest
@@ -1,15 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.0b4-profiling.patch 2003 RMD160 970293017ec800d6e8f98faf9c5d22b698729b29 SHA1 685116326b0db04052a816e9512cf03d50129009 SHA256 235801d7370c2eccf8946853ab8bfdd70f9cd4255df01b01f592e39a06cae08f
+MD5 80642177cb680dc36c305e7c6a482d80 files/1.0b4-profiling.patch 2003
+RMD160 970293017ec800d6e8f98faf9c5d22b698729b29 files/1.0b4-profiling.patch 2003
+SHA256 235801d7370c2eccf8946853ab8bfdd70f9cd4255df01b01f592e39a06cae08f files/1.0b4-profiling.patch 2003
 DIST cpptasks-1.0b4.tar.gz 879715 RMD160 bfd90f71412ead94023da3b0a4156309dd4f6f4a SHA1 32c46e752cdac576d4b59d5f1d3324a75295c4ad SHA256 3472af7389c5a7daaff48a054c2b9f10994b55352025b8a2249a7dfcebca14c8
+EBUILD cpptasks-1.0_beta4-r1.ebuild 1387 RMD160 3e99b1055954980bd383b219fa9988345eef6abb SHA1 912ad6e44089c826b68b680cb90895400315f6f9 SHA256 8399f7001f4a4e640117143bd15305cad9c08ff59944006979cef934f77699c2
+MD5 24d73737faad4ff406b467bdd7d7159b cpptasks-1.0_beta4-r1.ebuild 1387
+RMD160 3e99b1055954980bd383b219fa9988345eef6abb cpptasks-1.0_beta4-r1.ebuild 1387
+SHA256 8399f7001f4a4e640117143bd15305cad9c08ff59944006979cef934f77699c2 cpptasks-1.0_beta4-r1.ebuild 1387
 EBUILD cpptasks-1.0_beta4.ebuild 1308 RMD160 481d09a179104ff267ff2f6a46034b27c99f1ea4 SHA1 2b71af126adfb82a7bc5854cc31473f9945b8560 SHA256 915f0721f27723bb3e9f8e94f160a8991d29b870e026a870fa0852aabfafd079
 MD5 af69ce28b8d1bad1ab93bd69b6b86e29 cpptasks-1.0_beta4.ebuild 1308
 RMD160 481d09a179104ff267ff2f6a46034b27c99f1ea4 cpptasks-1.0_beta4.ebuild 1308
 SHA256 915f0721f27723bb3e9f8e94f160a8991d29b870e026a870fa0852aabfafd079 cpptasks-1.0_beta4.ebuild 1308
-MISC ChangeLog 1158 RMD160 0985a4b8d0be9362e80b398efa4dc1a0d05dc077 SHA1 c58e2aff651971291d2fef8a56492ac9daf44678 SHA256 17eb4cf6f33c0d31d6eb4d40849c25e3a1e9ed129b7fdf60a403e32fc9adc88e
-MD5 26c5a260ca9c63f49af6fc144d81bbed ChangeLog 1158
-RMD160 0985a4b8d0be9362e80b398efa4dc1a0d05dc077 ChangeLog 1158
-SHA256 17eb4cf6f33c0d31d6eb4d40849c25e3a1e9ed129b7fdf60a403e32fc9adc88e ChangeLog 1158
+MISC ChangeLog 1505 RMD160 4b9d003fadbf52716994aa32fb343e2b659d13ba SHA1 cc99145153c7f70ef72130902baf5c4363993ac6 SHA256 b79cb422d4a58e169dacb48115d16de1676363fdf27322333abf27d11d095cc3
+MD5 083153fdcafb52295efa5708951e18b2 ChangeLog 1505
+RMD160 4b9d003fadbf52716994aa32fb343e2b659d13ba ChangeLog 1505
+SHA256 b79cb422d4a58e169dacb48115d16de1676363fdf27322333abf27d11d095cc3 ChangeLog 1505
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
 MD5 9f455923f62e1ecb14ebb7f29636850a metadata.xml 159
 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f metadata.xml 159
@@ -17,10 +25,13 @@ SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb metadata
 MD5 bc0a738dea504b6dbf0d546edf1e90c5 files/digest-cpptasks-1.0_beta4 244
 RMD160 5620be26c5dde5c9b827f2c43539de3112308583 files/digest-cpptasks-1.0_beta4 244
 SHA256 e50f0e29de3ef5aebde002e8c97db224c8497aaaf5915a43d354e5c0ab536362 files/digest-cpptasks-1.0_beta4 244
+MD5 bc0a738dea504b6dbf0d546edf1e90c5 files/digest-cpptasks-1.0_beta4-r1 244
+RMD160 5620be26c5dde5c9b827f2c43539de3112308583 files/digest-cpptasks-1.0_beta4-r1 244
+SHA256 e50f0e29de3ef5aebde002e8c97db224c8497aaaf5915a43d354e5c0ab536362 files/digest-cpptasks-1.0_beta4-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFicfNcxLzpIGCsLQRAj76AJ9smKkRRin2VWPqIcqzM8aNc/HyPACgjaWF
-cYZwNBw9S0611qsrEZjnfQw=
-=VcPw
+iD8DBQFFzb4QcxLzpIGCsLQRAgOfAJ9UJlipFXoRBq9Z+KRIBZ0/u7qyjgCfdCFZ
+sPRPB1fJMlAAzSICd4zN/m4=
+=HQ+w
 -----END PGP SIGNATURE-----

diff --git a/dev-java/cpptasks/cpptasks-1.0_beta4-r1.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta4-r1.ebuild
new file mode 100644 (file)
index 0000000..bc98db4
--- /dev/null
+++ b/dev-java/cpptasks/cpptasks-1.0_beta4-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cpptasks/cpptasks-1.0_beta4-r1.ebuild,v 1.1 2007/02/10 12:43:51 betelgeuse Exp $
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}-${PV/_beta/b}"
+DESCRIPTION="Ant-tasks to compile various source languages and produce executables, shared libraries and static libraries"
+HOMEPAGE="http://ant-contrib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ant-contrib/${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc source examples"
+
+RDEPEND=">=virtual/jre-1.4
+        >=dev-java/ant-core-1.7
+        >=dev-java/xerces-2.7"
+DEPEND=">=virtual/jdk-1.4
+       ${RDEPEND}
+       source? ( app-arch/zip )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+       unpack ${A}
+       # https://sourceforge.net/tracker/index.php?func=detail&aid=829906&group_id=36177&atid=416920
+       # https://bugs.gentoo.org/show_bug.cgi?id=156596
+       epatch "${FILESDIR}/1.0b4-profiling.patch"
+       cd "${S}"
+       rm -v *.jar || die
+       java-ant_rewrite-classpath
+}
+
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="javadocs -Dbuild.javadocs=build/api"
+EANT_GENTOO_CLASSPATH="ant-core,xerces-2"
+
+src_install() {
+       java-pkg_dojar build/lib/${PN}.jar
+
+       java-pkg_register-ant-task
+
+       dodoc NOTICE || die
+       use doc && java-pkg_dojavadoc build/api
+       use examples && dodoc samples/*
+       use source && java-pkg_dosrc src/net
+
+}

diff --git a/dev-java/cpptasks/files/1.0b4-profiling.patch b/dev-java/cpptasks/files/1.0b4-profiling.patch
new file mode 100644 (file)
index 0000000..6795ecd
--- /dev/null
+++ b/dev-java/cpptasks/files/1.0b4-profiling.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/attachment.cgi?id=102974
+https://sourceforge.net/tracker/index.php?func=detail&aid=829906&group_id=36177&atid=416920
+
+diff -ur cpptasks-1.0b4.orig/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java cpptasks-1.0b4/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
+--- cpptasks-1.0b4.orig/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java      2006-11-29 13:05:30.000000000 +0100
++++ cpptasks-1.0b4/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java   2006-11-29 13:14:00.000000000 +0100
+@@ -35,7 +35,7 @@
+     private static String[] linkerOptions = new String[]{"-bundle",
+             "-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-s",
+             "-static", "-shared", "-symbolic", "-Xlinker",
+-            "--export-all-symbols", "-static-libgcc",};
++            "--export-all-symbols", "-static-libgcc", "-pg", };
+     private static final GccLinker dllLinker = new GccLinker("gcc", objFiles,
+             discardFiles, "lib", ".so", false, new GccLinker("gcc", objFiles,
+                     discardFiles, "lib", ".so", true, null));
+diff -ur cpptasks-1.0b4.orig/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java cpptasks-1.0b4/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
+--- cpptasks-1.0b4.orig/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java      2006-11-29 13:05:30.000000000 +0100
++++ cpptasks-1.0b4/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java   2006-11-29 13:13:21.000000000 +0100
+@@ -41,7 +41,7 @@
+             ".lib", ".dll", ".so", ".sl"};
+     private static String[] linkerOptions = new String[]{"-bundle", "-dylib",
+             "-dynamic", "-dynamiclib", "-nostartfiles", "-nostdlib",
+-            "-prebind", "-s", "-static", "-shared", "-symbolic", "-Xlinker"};
++            "-prebind", "-s", "-static", "-shared", "-symbolic", "-Xlinker", "-pg" };
+     private static final GppLinker instance = new GppLinker("gcc", objFiles,
+             discardFiles, "", "", false, null);
+     private static final GppLinker machDllLinker = new GppLinker("gcc",

diff --git a/dev-java/cpptasks/files/digest-cpptasks-1.0_beta4-r1 b/dev-java/cpptasks/files/digest-cpptasks-1.0_beta4-r1
new file mode 100644 (file)
index 0000000..9a584bc
--- /dev/null
+++ b/dev-java/cpptasks/files/digest-cpptasks-1.0_beta4-r1
@@ -0,0 +1,3 @@
+MD5 1b770a0b07a9f2f3c558bca1ad619439 cpptasks-1.0b4.tar.gz 879715
+RMD160 bfd90f71412ead94023da3b0a4156309dd4f6f4a cpptasks-1.0b4.tar.gz 879715
+SHA256 3472af7389c5a7daaff48a054c2b9f10994b55352025b8a2249a7dfcebca14c8 cpptasks-1.0b4.tar.gz 879715