net-im/tigase-server: Ebuild version bump, now uses java-config to find essential jars instead of config, leaving config to user added classes.

svn path=/sunrise/; revision=7207

4 files changed, 11 insertions, 6 deletions

diff --git a/net-im/tigase-server/ChangeLog b/net-im/tigase-server/ChangeLog
index ecbaeacda..b19976284 100644
--- a/net-im/tigase-server/ChangeLog
+++ b/net-im/tigase-server/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Oct 2008; Mads Randstoft (mazzachre) mads_randstoft@yahoo.dk
+  -tigase-server-9999_pre2.ebuild, +tigase-server-9999_pre3.ebuild,
+  files/init_d_tigase:
+  Ebuild version bump, now uses java-config to find essential jars instead of
+  config, leaving config to user added classes.
+
   07 Oct 2008; Mads Randstoft (mazzachre) <mads_randstoft@yahoo.dk>
   +tigase-server-9999_pre2.ebuild, +files/classpaths.patch,
   +files/conf_d_tigase, +files/default_config.patch, +files/init_d_tigase,
diff --git a/net-im/tigase-server/Manifest b/net-im/tigase-server/Manifest
index dafeef485..ad4304716 100644
--- a/net-im/tigase-server/Manifest
+++ b/net-im/tigase-server/Manifest
@@ -1,7 +1,7 @@
 AUX classpaths.patch 1353 RMD160 d4108e2629e309d0495e75a039d3084864b908dc SHA1 81d0f0c657af9f18a7e05b2eadff5833d54a599e SHA256 e44585d895a3d3759b4516ab6cc1808b985a270ab9668379f9ca61b591c9c99c
 AUX conf_d_tigase 187 RMD160 ae8d29f67017506298ad19235555c0fe3a844ec3 SHA1 958e0dfb910f872e6e9f89491580c388d9af562d SHA256 228b292fd577c84870871b40a555b511685afd28e60901e9b215b98b6d74bc46
 AUX default_config.patch 2706 RMD160 2caee9d6603d9cd657fc5b772e0fcab2268db47e SHA1 4e2f0b5c380de945677567bc924021261e7b9cef SHA256 a8c280aed7170d814d084a7bcee861483338d5cffd4065b7aa61362bf37ca09a
-AUX init_d_tigase 1109 RMD160 268e9f94c5472c82927e0251647eab1b8b38b0a0 SHA1 1f18338d5c9c4778659890d62644f3f7a22d62fd SHA256 55cdecc82b9d57ce776f53a0e358b2e8adf512acce2774adc6f738908647cba4
-EBUILD tigase-server-9999_pre2.ebuild 2133 RMD160 ef27a080e889b52db3969cb0348da1a1431056a4 SHA1 a720658e3fd59ce94c43a5106bfdeffc72f7a9e3 SHA256 39abe07334b454ebecbe790bc1bec8cf00fe8e765beba8951d966c353ea3fb47
-MISC ChangeLog 373 RMD160 722e9fe62e2c844ec2e7612f68a547609c6fd770 SHA1 b54bd0deb66705487923a2088255e239b5c77df8 SHA256 4a2b2e251ab1e2a0e29913edee2b329a38cf9f15add19c1ebe168de433405790
+AUX init_d_tigase 1175 RMD160 d87e2bfb1496dfa1fce89739dec6c32f797ad649 SHA1 4bcb5fea18803295699fbfadf61305eaafafd1d0 SHA256 4052a2e82655a8ad7141beaf211069dd305df9c526c63c3de0c364c0be8ac39f
+EBUILD tigase-server-9999_pre3.ebuild 1887 RMD160 5e6a377895b0a9044c9b1529ae5915a2d6cfead3 SHA1 285b365d3766b7e769b89c48f2102d13fd2bbed2 SHA256 88bd790d8d1e99302cd35476ebe83f175d90e43399e90b061eb2239b995b1b2f
+MISC ChangeLog 657 RMD160 4be3dfb679216ea0bfa2109a97bb12e824effe28 SHA1 367d28fb99b85186cc188cac19266af1bb39fe6e SHA256 afd8bf2319a85fa459ff171abf7a5662483e8b869f1c3a406fa0ed2fb869927d
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-im/tigase-server/files/init_d_tigase b/net-im/tigase-server/files/init_d_tigase
index d47e07334..128d9cf7c 100644
--- a/net-im/tigase-server/files/init_d_tigase
+++ b/net-im/tigase-server/files/init_d_tigase
@@ -18,7 +18,7 @@ start()	{
 
 	ebegin "Starting Tigase"
 
-	start-stop-daemon --user ${TIGASE_USER} --start --quiet --background --pidfile /var/run/tigase --make-pidfile --exec /usr/bin/java -- ${JAVA_OPTIONS} -classpath ${CLASSPATH} tigase.server.XMPPServer -c ${TIGASE_CONFIG} ${TIGASE_OPTIONS}
+	start-stop-daemon --user ${TIGASE_USER} --start --quiet --background --pidfile /var/run/tigase --make-pidfile --exec /usr/bin/java -- ${JAVA_OPTIONS} -classpath $(java-config -dp tigase-server):${CLASSPATH} tigase.server.XMPPServer -c ${TIGASE_CONFIG} ${TIGASE_OPTIONS}
 	eend $?
 }
 
@@ -36,6 +36,6 @@ svc_restart () {
 
 	start-stop-daemon -u tigase --stop --quiet --pidfile /var/run/tigase
 	sleep 5
-	start-stop-daemon --user ${TIGASE_USER} --start --quiet --background --pidfile /var/run/tigase --make-pidfile --exec /usr/bin/java -- ${JAVA_OPTIONS} -classpath ${CLASSPATH} tigase.server.XMPPServer -c ${TIGASE_CONFIG} ${TIGASE_OPTIONS}
+	start-stop-daemon --user ${TIGASE_USER} --start --quiet --background --pidfile /var/run/tigase --make-pidfile --exec /usr/bin/java -- ${JAVA_OPTIONS} -classpath $(java-config -dp tigase-server):${CLASSPATH} tigase.server.XMPPServer -c ${TIGASE_CONFIG} ${TIGASE_OPTIONS}
 	eend $?
 }
diff --git a/net-im/tigase-server/tigase-server-9999_pre2.ebuild b/net-im/tigase-server/tigase-server-9999_pre3.ebuild
index 26f173e96..374b4a6e4 100644
--- a/net-im/tigase-server/tigase-server-9999_pre2.ebuild
+++ b/net-im/tigase-server/tigase-server-9999_pre3.ebuild
@@ -74,7 +74,6 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	sed -i -e "s|CLASSPATH=.*|&:$(java-pkg_getjar tigase-xmltools tigase-xmltools.jar):$(java-pkg_getjar tigase-utils tigase-utils.jar):$(java-pkg_getjar tigase-server tigase-server.jar)|" /etc/conf.d/tigase || die "Failed to configure conf.d file"
 	elog "Remember to change config file and conf.d file to your needs."
 	elog "Config file is default generated by server is not present."
 	elog ""