diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-db/henplus/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
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
Diffstat (limited to 'dev-db/henplus/files')
-rw-r--r-- | dev-db/henplus/files/0.9.8-build.xml.patch | 23 | ||||
-rw-r--r-- | dev-db/henplus/files/henplus-0.9.7-build.xml.patch | 34 | ||||
-rw-r--r-- | dev-db/henplus/files/henplus.patch | 42 | ||||
-rwxr-xr-x | dev-db/henplus/files/henplus.pre | 51 |
4 files changed, 150 insertions, 0 deletions
diff --git a/dev-db/henplus/files/0.9.8-build.xml.patch b/dev-db/henplus/files/0.9.8-build.xml.patch new file mode 100644 index 000000000000..e2763978080e --- /dev/null +++ b/dev-db/henplus/files/0.9.8-build.xml.patch @@ -0,0 +1,23 @@ +diff -ur henplus-0.9.8.old/build.xml henplus-0.9.8/build.xml +--- henplus-0.9.8.old/build.xml 2009-05-01 23:51:41.000000000 +0300 ++++ henplus-0.9.8/build.xml 2009-05-01 23:52:31.000000000 +0300 +@@ -33,13 +33,13 @@ + <pathelement path="${classes}" /> + </path> + +- <taskdef name="ant-server" classname="net.sweetohm.ant.server.ServerTask"> +- <classpath> +- <pathelement location="${lib}/build/sat-0.7.jar" /> +- </classpath> +- </taskdef> +- + <target name="server"> ++ <taskdef name="ant-server" classname="net.sweetohm.ant.server.ServerTask"> ++ <classpath> ++ <pathelement location="${lib}/build/sat-0.7.jar" /> ++ </classpath> ++ </taskdef> ++ + <ant-server/> + </target> + diff --git a/dev-db/henplus/files/henplus-0.9.7-build.xml.patch b/dev-db/henplus/files/henplus-0.9.7-build.xml.patch new file mode 100644 index 000000000000..2e4a43a039e3 --- /dev/null +++ b/dev-db/henplus/files/henplus-0.9.7-build.xml.patch @@ -0,0 +1,34 @@ +--- build.xml.orig 2006-10-17 22:25:57.000000000 +0200 ++++ build.xml 2006-10-17 22:27:34.000000000 +0200 +@@ -21,26 +21,26 @@ + <property name="libreadline-java" value="libreadline-java-0.8.0.jar"/> + + <path id="compile.classpath"> +- <fileset dir="${lib}"> +- <include name="${libreadline-java}"/> +- <include name="${commons-cli}"/> +- </fileset> ++ <fileset dir="${lib}" includes="**/*.jar"/> + </path> + + <path id="run.classpath"> + <path refid="compile.classpath" /> + <pathelement path="${classes}" /> + </path> +- ++ ++ <!-- + <taskdef name="ant-server" classname="net.sweetohm.ant.server.ServerTask"> + <classpath> + <pathelement location="${lib}/build/sat-0.7.jar" /> + </classpath> + </taskdef> ++ + + <target name="server"> + <ant-server/> + </target> ++ --> + + <target name="prepare"> + <tstamp> diff --git a/dev-db/henplus/files/henplus.patch b/dev-db/henplus/files/henplus.patch new file mode 100644 index 000000000000..abc92d364d70 --- /dev/null +++ b/dev-db/henplus/files/henplus.patch @@ -0,0 +1,42 @@ +--- a/bin/henplus 2004-02-02 14:53:28.000000000 +0100 ++++ b/bin/henplus 2004-07-23 11:21:11.518166136 +0200 +@@ -2,6 +2,7 @@ + # $Id$ + ## + ++echo $(dirname $0) + # additional flags you might want to pass to the java interpreter + # like -Dfile.encoding=ISO-8859-1 + JAVA_FLAGS= +@@ -13,20 +14,8 @@ + JAVA=$JAVA_HOME/bin/java + fi + +-##------------------ +-THISDIR=`dirname $0` +-HENPLUSDIR=$THISDIR/../share/henplus +- +-# not yet installed ? Then look in the build directory +-if [ ! -d "$HENPLUSDIR" ] ; then +- HENPLUSDIR=$THISDIR/../build +-fi +- +-# location of the readline lib. +-# Modify this, if you installation stores this at a different +-# position. +-LD_LIBRARY_PATH=$THISDIR/../lib:/usr/lib/jni:$LD_LIBRARY_PATH +-CLASSPATH=$CLASSPATH:$THISDIR/../share/java/libreadline-java.jar ++HENPLUSDIR=$(dirname $(java-config -p henplus)) ++CLASSPATH=$CLASSPATH:$(java-config -p libreadline-java) + + # you may just throw your own jar files in this dir. + # (like additional JDBC-drivers, that are not in default +@@ -65,7 +54,4 @@ + CLASSPATH=$CLASSPATH:$f + fi + done +- +-export CLASSPATH LD_LIBRARY_PATH +- +-exec $JAVA $JAVA_FLAGS henplus.HenPlus "$@" ++LD_LIBRARY_PATH="$(java-config -i libreadline-java):$LD_LIBRARY_PATH" exec $JAVA -cp $CLASSPATH $JAVA_FLAGS henplus.HenPlus "$@" diff --git a/dev-db/henplus/files/henplus.pre b/dev-db/henplus/files/henplus.pre new file mode 100755 index 000000000000..c29585e369fa --- /dev/null +++ b/dev-db/henplus/files/henplus.pre @@ -0,0 +1,51 @@ +# +# Based on the upstream script but parts not relevant to Gentoo +# stripped away. We would not need this at all but better to make +# this behave as the upstream docs say and then also have all the +# Gentoo goodies. +# https://bugs.gentoo.org/show_bug.cgi?id=176185 + +##------------------ +THISDIR=`dirname $0` +# install layout is: script in /usr/bin/henplus and libs in /usr/share/henplus +HENPLUSDIR=$THISDIR/../share/henplus + +# you may just throw your own jar files in this dir. +# (like additional JDBC-drivers, that are not in default +# classpath) +for f in $HENPLUSDIR/*.jar $HENPLUSDIR/*.zip ; do + if [ -r "$f" ] ; then + CLASSPATH=$CLASSPATH:$f + fi +done + +# starting at the current directory we look for additional +# JDBC-drivers in .henplus/lib-directories up the path. +# if no directory like that has been found the one in the +# home directory will be used +DIR=`pwd` +CUSTOM_HENPLUSDIR="" + +while [ $DIR != "/" ] ; do + if [ -d $DIR"/.henplus/lib" ]; then + CUSTOM_HENPLUSDIR=$DIR"/.henplus/lib" + break + fi + DIR=`dirname $DIR` +done + +if [ -z $CUSTOM_HENPLUSDIR ]; then + if [ -d "/.henplus/lib" ]; then + CUSTOM_HENPLUSDIR="/.henplus/lib" + else + CUSTOM_HENPLUSDIR=$HOME/.henplus/lib + fi +fi + +for f in $CUSTOM_HENPLUSDIR/*.jar $CUSTOM_HENPLUSDIR/*.zip ; do + if [ -r "$f" ] ; then + CLASSPATH=$CLASSPATH:$f + fi +done + +export CLASSPATH |