Version bump (#446896 by Chris Shelton), also fix licenses (#444412 by Ulrich Müller) and fix init.d script (#442878 by Mads). Thanks to Martin von Gagern for the work. Drop old.

(Portage version: 2.1.11.37/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

5 files changed, 69 insertions, 41 deletions

diff --git a/app-backup/tsm/ChangeLog b/app-backup/tsm/ChangeLog
index ced8087f8c32..facb2ae38b9e 100644
--- a/app-backup/tsm/ChangeLog
+++ b/app-backup/tsm/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-backup/tsm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/ChangeLog,v 1.15 2012/07/12 14:16:32 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/ChangeLog,v 1.16 2012/12/16 11:41:02 pacho Exp $
+
+*tsm-6.2.2.0-r2 (16 Dec 2012)
+*tsm-6.4.0.0 (16 Dec 2012)
+*tsm-6.3.0.5-r2 (16 Dec 2012)
+
+  16 Dec 2012; Pacho Ramos <pacho@gentoo.org> +files/dsmcad.init.d-r1,
+  +tsm-6.2.2.0-r2.ebuild, +tsm-6.3.0.5-r2.ebuild, +tsm-6.4.0.0.ebuild,
+  -tsm-6.2.2.0-r1.ebuild, -tsm-6.3.0.0-r1.ebuild, -tsm-6.3.0.5-r1.ebuild:
+  Version bump (#446896 by Chris Shelton), also fix licenses (#444412 by Ulrich
+  Müller) and fix init.d script (#442878 by Mads). Thanks to Martin von Gagern
+  for the work. Drop old.
 
   12 Jul 2012; Ian Stakenvicius <axs@gentoo.org> tsm-6.2.2.0-r1.ebuild,
   tsm-6.3.0.0-r1.ebuild, tsm-6.3.0.5-r1.ebuild:
@@ -75,4 +86,3 @@
   +files/dsmc.conf.d, +files/dsmc.init.d, +metadata.xml:
   Initial import, #20291. Thanks to all people who participated in writing
   this ebuild.
-
diff --git a/app-backup/tsm/files/dsmcad.init.d-r1 b/app-backup/tsm/files/dsmcad.init.d-r1
new file mode 100755
index 000000000000..387d140f5a78
--- /dev/null
+++ b/app-backup/tsm/files/dsmcad.init.d-r1
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/files/dsmcad.init.d-r1,v 1.1 2012/12/16 11:41:03 pacho Exp $
+
+command=/opt/tivoli/tsm/client/ba/bin/dsmcad
+
+depend() {
+        use net
+        after dns dsmc
+}
+
+start() {
+        ebegin "Starting dsmcad"
+        start-stop-daemon --start --nicelevel 15 \
+                --exec ${command}
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping dsmcad"
+        start-stop-daemon --stop \
+                --signal 1 \
+                --exec ${command}
+        eend $?
+}
diff --git a/app-backup/tsm/tsm-6.2.2.0-r1.ebuild b/app-backup/tsm/tsm-6.2.2.0-r2.ebuild
index 29a9f898b67d..35b3df2145df 100644
--- a/app-backup/tsm/tsm-6.2.2.0-r1.ebuild
+++ b/app-backup/tsm/tsm-6.2.2.0-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/tsm-6.2.2.0-r1.ebuild,v 1.6 2012/07/12 14:16:32 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/tsm-6.2.2.0-r2.ebuild,v 1.1 2012/12/16 11:41:02 pacho Exp $
 
-EAPI=3
+EAPI=5
 
 inherit versionator multilib eutils rpm pax-utils user
 
@@ -21,11 +21,16 @@ SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
 SRC_URI="${BASE_URI}${SRC_TAR}"
 
 RESTRICT="strip" # Breaks libPiIMG.ss and libPiSNAP.so
-LICENSE="as-is Apache-1.1 JDOM gSOAP GPL-2"
+LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
+	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP jaxen LGPL-2 LGPL-2.1 openafs-krb5-a
+	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
+	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="hsm"
 
+QA_PREBUILT="*"
+
 MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT
 	ja:JA_JP ko:KO_KR pl:PL_PL pt:PT_BR ru:RU_RU zh:ZH_CN zh_TW:ZH_TW"
 MY_LANG_PV="$(get_version_component_range 1-3)-"
@@ -78,7 +83,7 @@ src_unpack() {
 src_prepare() {
 	# Avoid unnecessary dependency on ksh
 	sed -i 's:^#!/usr/bin/ksh:#!/bin/bash:' \
-		opt/tivoli/tsm/client/ba/bin/dsmj
+		opt/tivoli/tsm/client/ba/bin/dsmj || die
 }
 
 src_install() {
@@ -191,7 +196,7 @@ src_install() {
 
 	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
 	newinitd "${FILESDIR}/dsmc.init.d" dsmc
-	newinitd "${FILESDIR}/dsmcad.init.d" dsmcad
+	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
 
 	elog
 	elog "Note that you have to be either root or member of the group tsm to be able to use the"
@@ -211,8 +216,7 @@ pkg_postinst() {
 	done
 }
 
-pkg_postinst()
-{
+pkg_postinst() {
 	pax-mark psme /opt/tivoli/tsm/client/ba/bin/dsmc
 	# most likely some of the other executables (e.g. dsm) need this as well, but I
 	# cannot test it at the moment. - dilfridge
diff --git a/app-backup/tsm/tsm-6.3.0.5-r1.ebuild b/app-backup/tsm/tsm-6.3.0.5-r2.ebuild
index 1452da7595b0..ddebd8e9ea06 100644
--- a/app-backup/tsm/tsm-6.3.0.5-r1.ebuild
+++ b/app-backup/tsm/tsm-6.3.0.5-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/tsm-6.3.0.5-r1.ebuild,v 1.3 2012/07/12 14:16:32 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/tsm-6.3.0.5-r2.ebuild,v 1.1 2012/12/16 11:41:02 pacho Exp $
 
-EAPI=4
+EAPI=5
 
 inherit versionator multilib eutils rpm user
 
@@ -29,17 +29,15 @@ SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
 SRC_URI="${BASE_URI}${SRC_TAR}"
 
 RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
-LICENSE="as-is Apache-1.1 JDOM gSOAP GPL-2"
+LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
+	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP jaxen LGPL-2 LGPL-2.1 openafs-krb5-a
+	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
+	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
+
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="acl java +tsm_cit +tsm_hw"
-QA_PREBUILT="opt/tivoli/tsm/client/api/bin64/cit/bin/* \
-	opt/tivoli/tsm/client/ba/bin/cit/bin/*
-	opt/tivoli/tsm/client/api/bin64/cit/VMware/esx-4/dispatcher
-	opt/tivoli/tsm/client/ba/bin/cit/VMware/esx-4/dispatcher
-	opt/tivoli/tsm/client/ba/bin/libzephyr.so
-	usr/local/ibm/gsk8_64/lib64/N/icc/osslib/libcryptoIBM081.so.0.9.8
-	usr/local/ibm/gsk8_64/lib64/C/icc/osslib/*"
+QA_PREBUILT="*"
 
 MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT
 	ja:JA_JP ko:KO_KR pl:PL_PL pt:PT_BR ru:RU_RU zh:ZH_CN zh_TW:ZH_TW"
@@ -214,7 +212,7 @@ src_install() {
 
 	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
 	newinitd "${FILESDIR}/dsmc.init.d" dsmc
-	newinitd "${FILESDIR}/dsmcad.init.d" dsmcad
+	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
 
 	elog
 	elog "Note that you have to be either root or member of the group tsm to"
diff --git a/app-backup/tsm/tsm-6.3.0.0-r1.ebuild b/app-backup/tsm/tsm-6.4.0.0.ebuild
index ef065578efcb..52712599b990 100644
--- a/app-backup/tsm/tsm-6.3.0.0-r1.ebuild
+++ b/app-backup/tsm/tsm-6.4.0.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/tsm-6.3.0.0-r1.ebuild,v 1.3 2012/07/12 14:16:32 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/tsm-6.4.0.0.ebuild,v 1.1 2012/12/16 11:41:02 pacho Exp $
 
-EAPI=4
+EAPI=5
 
 inherit versionator multilib eutils rpm user
 
@@ -29,17 +29,15 @@ SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
 SRC_URI="${BASE_URI}${SRC_TAR}"
 
 RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
-LICENSE="as-is Apache-1.1 JDOM gSOAP GPL-2"
+LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
+	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP jaxen LGPL-2 LGPL-2.1 openafs-krb5-a
+	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
+	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
+
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="acl java +tsm_cit +tsm_hw"
-QA_PREBUILT="opt/tivoli/tsm/client/api/bin64/cit/bin/* \
-	opt/tivoli/tsm/client/ba/bin/cit/bin/*
-	opt/tivoli/tsm/client/api/bin64/cit/VMware/esx-4/dispatcher
-	opt/tivoli/tsm/client/ba/bin/cit/VMware/esx-4/dispatcher
-	opt/tivoli/tsm/client/ba/bin/libzephyr.so
-	usr/local/ibm/gsk8_64/lib64/N/icc/osslib/libcryptoIBM081.so.0.9.8
-	usr/local/ibm/gsk8_64/lib64/C/icc/osslib/*"
+QA_PREBUILT="*"
 
 MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT
 	ja:JA_JP ko:KO_KR pl:PL_PL pt:PT_BR ru:RU_RU zh:ZH_CN zh_TW:ZH_TW"
@@ -116,7 +114,7 @@ src_install() {
 	# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
 	# Below we try to mimic the behaviour of these scripts.
 	# We don't deal with SELinux compliance (yet), though.
-	local RPM_INSTALL_PREFIX CLIENTDIR TIVINV_DIR TIVINVFILE i
+	local RPM_INSTALL_PREFIX CLIENTDIR i
 	RPM_INSTALL_PREFIX=/opt
 	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
 
@@ -138,14 +136,6 @@ src_install() {
 	done
 
 	# Mimic TIVsm-BA postinstall script
-	# Create Tivoli Inventory file
-	TIVINV_DIR="/opt/tivoli/tsm/tivinv"
-	TIVINVFILE="TIVTSMBAC0603.SYS2"
-	dodir $TIVINV_DIR
-	echo "                                                 " \
-		> "${D}$TIVINV_DIR/$TIVINVFILE"
-	fperms 555 $TIVINV_DIR/$TIVINVFILE
-
 	# Create a link to libexpat if needed
 	if [ ! -e "${ROOT}"/usr/lib64/libexpat.so.0 -a -e "${ROOT}"/usr/lib64/libexpat.so.1 ]
 	then
@@ -201,7 +191,7 @@ src_install() {
 	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
 	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
 
-	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt" || die
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
 	dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
 
 	# Setup the env
@@ -214,7 +204,7 @@ src_install() {
 
 	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
 	newinitd "${FILESDIR}/dsmc.init.d" dsmc
-	newinitd "${FILESDIR}/dsmcad.init.d" dsmcad
+	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
 
 	elog
 	elog "Note that you have to be either root or member of the group tsm to"