Commit Graph
30 Commits
Author SHA1 Message Date
James Le Cuirot af9620f533 java-utils-2.eclass: Fix java-pkg_gen-cp regex for chained PV suffixes 2017-12-29 21:43:55 +00:00
Robin H. Johnson 61b861acd7 Drop $Id$ per council decision in bug #611234.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
2017-02-28 11:50:50 -08:00
Patrice Clement 2256413068 eclass/java-utils-2.eclass: Convert the few remaining bits to EAPI 6. 2017-02-22 23:17:17 +01:00
Benda Xu ba1dfb56bb java-utils-2.eclass: use is not available in the global scope.
Java ebuilds using EAPI<3 will not be correctly prefixified.
  We will deal with that by bumping EAPI per package.
2017-02-09 20:20:51 +09:00
Benda Xu 44a5a4e783 eclass/java-utils-2.eclass: support Prefix.
Reintroduce fbdddd87ff with EAPI gatekeeping code.

Credit:  Martin Mokrejš
Bug: 595002
2017-02-09 20:13:53 +09:00
James Le Cuirot ee2fad9a31 Revert "eclass/java-utils-2.eclass: support Prefix."
This reverts commit fbdddd87ff. It
didn't take account of older EAPIs.
2017-02-09 09:54:28 +00:00
Benda Xu fbdddd87ff eclass/java-utils-2.eclass: support Prefix.
Credit:  Martin Mokrejš
Bug: 595002
2017-02-09 13:47:37 +09:00
James Le Cuirot 4f7bb1bd2e java-utils-2.eclass: Call eapply_user and drop java_prepare for EAPI 6
Although simply calling default sounds like a good idea, if an ebuild
needs to use multiple eclasses that call default then patching will
break as PATCHES will be applied more than once. eapply_user, on the
other hand, is idempotent. If an ebuild needs to apply PATCHES then it
should define src_prepare and call default explicitly. This will
probably be improved in EAPI 7.

java_prepare is being dropped because non-Java people find it
confusing and it isn't consistent. Other eclasses don't do this and we
don't apply the same rule to other phases either.
2016-10-17 16:15:24 +01:00
James Le Cuirot 74fd2b94e7 java-utils-2.eclass: Remove reference to long dead ant_src_unpack 2016-10-17 16:15:23 +01:00
James Le Cuirot b1698dfc05 java-utils-2.eclass: Rework wltjr's new java-pkg_gen-cp
* Use an accurate regexp rather than naive string manipulation.
* Join the entries with , for a single call to java-config.
* Don't export the given variable as we haven't previously.
* die if the atom is invalid, particularly if the SLOT is missing.
* Avoid adding duplicates because this may get called more than once.
2016-10-17 16:15:22 +01:00
William L. Thomson Jr a2ad06c333 java-utils-2.eclass: Added new function java-pkg_gen-cp
Java package generate classpath will create a classpath based on special
variable CP_DEPEND in the ebuild. This allows for automatic classpath
creation based on depends. Reduces chance of error in ebuild with slots
in deps not matching slots in classpath variable, etc. Not to most
elegant. Elected for multiple passes using bash vs external sed or awk.

Closes: https://github.com/gentoo/gentoo/pull/2286
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
2016-10-17 16:15:07 +01:00
Michał Górny 9f4fe74fbc java-utils-2.eclass: DESTTREE querying -> /usr, #566480 2016-05-14 11:54:20 +02:00
Michał Górny 6b77d8b80c java-utils-2.eclass: DESTTREE assignment -> into, #566480 2016-05-14 11:54:20 +02:00
Michał Górny 9a32b4351d java-utils-2.eclass: Use insinto & insopts instead of vars, #566480
Replace INSDESTTREE and INSOPTIONS internal variable references with
correct calls to insinto & insopts, using a subshell to scope them.
2016-05-14 11:54:20 +02:00
James Le Cuirot fc3dc8282e java-*.eclass: Bump java-config dependency to avoid bug #580504
People may remove java-config-wrapper without updating java-config,
leading to a broken setup.
2016-04-19 10:19:38 +01:00
William L. Thomson Jr 75b71f8afb eclass/java-utils-2.eclass: Added -r to xargs in java-pkg_addres
The -r option is necessary in case find does not output anything. Which
makes the jar uf command fail. This has no effect otherwise and should
be safe to add right away. It prevents potential issues/bug.
2016-02-22 10:29:47 +00:00
James Le Cuirot 8982abb1ca java-utils-2.eclass: Write package.env unconditionally
Fixes dev-db/sqldeveloper-4.1.3.20.78-r1. This is a case where all the
jars are installed without dojar and none of the dependencies are
mandatory. Although our regular launcher scripts aren't used, gjl is
still invoked to determine the appropriate JVM so package.env is
therefore necessary. The conditions didn't make much sense anyway as
package.env is only written off the back of functions that satisfy
them anyway. sqldeveloper has to call java-pkg_do_write_ manually to
force package.env to be written.
2016-02-10 20:43:21 +00:00
James Le Cuirot afc9b285e5 java-utils-2.eclass: Don't leave junk in /tmp after ejunit calls
Put the junk in ${T} instead.
2015-12-04 21:07:24 +00:00
Julian Ospald a413cb15f8 java-utils-2.eclass: add missing '|| die' on pushd/popd
Reviewed-By: James Le Cuirot <chewi@gentoo.org>
Reviewed-By: Patrice Clement <monsieurp@gentoo.org>
2015-10-25 20:22:06 +01:00
Patrice Clement 1b7c8eabaf java-utils-2.eclass: Remove eend calls. Remove javadoc_executable variable.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
2015-10-20 20:58:06 +00:00
Patrice Clement 5641866837 java-utils-2.eclass: Also improve java-pkg_do{javadoc,jar,src} logging.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
2015-10-20 14:33:56 +00:00
Patrice Clement bf2ed95f75 java-utils-2.eclass: Document JAVA_PKG_DEBUG variable. Tweak logging according to JAVA_PKG_DEBUG in ejavac and ejavadoc.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
2015-10-20 13:50:58 +00:00
Mike Frysinger 9dbbf5411d fix broken headers in a few random files 2015-10-05 21:16:53 -04:00
James Le Cuirot a8a4bbca2c java-utils-2.eclass: Fix this untested java-pkg_clean crap 2015-10-03 20:08:21 +01:00
Patrice Clement afef5d8321 eclass/java-utils-2: Allows a list of directories to be specified.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
2015-09-29 20:54:16 +00:00
Patrice Clement 247c3f8ab0 Merge remote-tracking branch 'remotes/github/pr/116'. 2015-09-29 20:54:10 +00:00
Justin Lecher 0fb6e70c61 eclass: gentoo.org has https per default
Signed-off-by: Justin Lecher <jlec@gentoo.org>
2015-09-25 09:11:22 +02:00
William L. Thomson Jr 08cd51b1ea eclass/java-utils-2: Added proposed function to remove *.class and *.jar files from sources. Long term should be called automatically all the time with optional override via JAVA_PKG_NO_CLEAN. 2015-09-21 20:57:46 -04:00
James Le Cuirot cb7b42ad0a java-utils-2.eclass: Make java-pkg_init-compiler_ output to stderr
It was corrupting the result of java-pkg_get-javac in rare
cases. Fixes bug #559230.
2015-09-04 23:49:55 +01:00
Robin H. Johnson 56bd759df1 proj/gentoo: Initial commit
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 <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
2015-08-08 17:38:18 -07:00