Revbump to add amd64 support, fix enewuser, cleanup init scripts and ebuild, and setup symlinks to lmutil.

(Portage version: 2.0.51.22-r2)

8 files changed, 100 insertions, 65 deletions

diff --git a/app-admin/flexlm/ChangeLog b/app-admin/flexlm/ChangeLog
index fe965165f0c3..e9c1a4ec8456 100644
--- a/app-admin/flexlm/ChangeLog
+++ b/app-admin/flexlm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/flexlm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/flexlm/ChangeLog,v 1.8 2005/04/24 06:53:09 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/flexlm/ChangeLog,v 1.9 2005/08/11 08:42:25 eradicator Exp $
+
+*flexlm-9.5-r1 (11 Aug 2005)
+
+  11 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org> files/flexlm-conf,
+  files/flexlm-init, -flexlm-9.5.ebuild, +flexlm-9.5-r1.ebuild:
+  Revbump to add amd64 support, fix enewuser, cleanup init scripts and ebuild.
 
   23 Apr 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
   flexlm-9.2.1.ebuild, flexlm-9.5.ebuild:
diff --git a/app-admin/flexlm/Manifest b/app-admin/flexlm/Manifest
index ca8bdb282e67..b58464d8d6dd 100644
--- a/app-admin/flexlm/Manifest
+++ b/app-admin/flexlm/Manifest
@@ -1,9 +1,11 @@
 MD5 859f50226d6b10ac73a57084df989358 ChangeLog 1258
 MD5 cf62eee332524a1feefa6f71aa0a0d14 flexlm-9.2.1.ebuild 1420
-MD5 0aa6c55d8242e4a80c7ad4ea3b7d16eb flexlm-9.5.ebuild 1385
+MD5 dc8b2674449e7931bbfcbce2f3fd9355 flexlm-9.5.ebuild 2251
 MD5 5c7d7d954668e2395e1aa050f2c646fb metadata.xml 333
+MD5 dc8b2674449e7931bbfcbce2f3fd9355 flexlm-9.5-r1.ebuild 2251
 MD5 1cd702ac8282f4716d4dcaa7bacf0f79 files/90flexlm 70
 MD5 ef848515f7535e89d36b4a423bdb8c5f files/digest-flexlm-9.2.1 162
 MD5 c31922f3a01789438d2b1412fee128da files/digest-flexlm-9.5 162
-MD5 ae792e337eb16321016d96484127d9c8 files/flexlm-conf 396
-MD5 0b69af044c14448bd26e26aa153a4edd files/flexlm-init 463
+MD5 80f288b9606a3517dbaafb91552170b2 files/flexlm-conf 402
+MD5 a6d0adb240e5ab389b2925c38105134e files/flexlm-init 468
+MD5 0ed860b182f7388a6f3e3b75db129bd1 files/digest-flexlm-9.5-r1 298
diff --git a/app-admin/flexlm/files/digest-flexlm-9.5 b/app-admin/flexlm/files/digest-flexlm-9.5
deleted file mode 100644
index 1d67b8206a96..000000000000
--- a/app-admin/flexlm/files/digest-flexlm-9.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 26fdf09f91bff59804e36641d1dbd1e6 lmgrd.Z 318617
-MD5 6d4f61b2ccfae6c6095d248aae18ec72 lmutil.Z 324583
-MD5 158c6ce96436974bb0043e458288d408 enduser.pdf 1136567
diff --git a/app-admin/flexlm/files/digest-flexlm-9.5-r1 b/app-admin/flexlm/files/digest-flexlm-9.5-r1
new file mode 100644
index 000000000000..159bf7f447a9
--- /dev/null
+++ b/app-admin/flexlm/files/digest-flexlm-9.5-r1
@@ -0,0 +1,5 @@
+MD5 158c6ce96436974bb0043e458288d408 enduser.pdf 1136567
+MD5 26fdf09f91bff59804e36641d1dbd1e6 lmgrd-x86-9.5.Z 318617
+MD5 d41d8cd98f00b204e9800998ecf8427e lmutil-x86-9.5.Z 0
+MD5 9018fd0d43a2eeeef7cd8f47b35e3e54 lmgrd-amd64-9.5.Z 327568
+MD5 ef74a02c259f539b15f993eee31e1270 lmutil-amd64-9.5.Z 163840
diff --git a/app-admin/flexlm/files/flexlm-conf b/app-admin/flexlm/files/flexlm-conf
index 187a96748a18..3a199f778bc4 100644
--- a/app-admin/flexlm/files/flexlm-conf
+++ b/app-admin/flexlm/files/flexlm-conf
@@ -1,11 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/flexlm/files/flexlm-conf,v 1.2 2004/09/28 00:17:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/flexlm/files/flexlm-conf,v 1.3 2005/08/11 08:42:25 eradicator Exp $
 
 # Logfile path: (NOTE: This must be uid/gid owned by the value of $LMUSER!)
-LMLOG=/var/log/flexlm.log
+LMLOG="/var/log/flexlm.log"
 
 # Run the lmgrd user as:
-LMUSER=flexlm
+LMUSER="flexlm"
 
-LMLICENSE=/etc/flexlm/license.dat
+# List all license files delimeted by a colon
+LMLICENSE="/etc/flexlm/license.dat"
+#LMLICENSE="${LMLICENSE}:/var/flexlm/aw.dat"
+#LMLICENSE="${LMLICENSE}:/opt/shake/keys/license.dat"
diff --git a/app-admin/flexlm/files/flexlm-init b/app-admin/flexlm/files/flexlm-init
index d4968ec2c00e..c362611df0fe 100644
--- a/app-admin/flexlm/files/flexlm-init
+++ b/app-admin/flexlm/files/flexlm-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/flexlm/files/flexlm-init,v 1.2 2004/09/28 00:17:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/flexlm/files/flexlm-init,v 1.3 2005/08/11 08:42:25 eradicator Exp $
 
 depend() {
 	need net
@@ -9,7 +9,7 @@ depend() {
 
 start() {
 	ebegin "Starting lmgrd"
-	su - $LMUSER -c "umask 022; /opt/flexlm/bin/lmgrd -c '$LMLICENSE' -l '$LMLOG'" 
+	su - ${LMUSER} -c "umask 022; /opt/flexlm/bin/lmgrd -c '${LMLICENSE}' -l '${LMLOG}'"
 	eend $?
 }
 
diff --git a/app-admin/flexlm/flexlm-9.5-r1.ebuild b/app-admin/flexlm/flexlm-9.5-r1.ebuild
new file mode 100644
index 000000000000..35dbc63ed92d
--- /dev/null
+++ b/app-admin/flexlm/flexlm-9.5-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/flexlm/flexlm-9.5-r1.ebuild,v 1.1 2005/08/11 08:42:25 eradicator Exp $
+
+inherit eutils
+
+DESCRIPTION="Macrovision FLEXlm license manager and utils"
+HOMEPAGE="http://www.macrovision.com/services/support/flexlm/lmgrd.shtml"
+SRC_URI="http://www.macrovision.com/services/support/flexlm/enduser.pdf
+	 x86? ( http://dev.gentoo.org/~eradicator/flexlm/lmgrd-x86-${PV}.Z
+	          http://dev.gentoo.org/~eradicator/flexlm/lmutil-x86-${PV}.Z )
+	 amd64? ( http://dev.gentoo.org/~eradicator/flexlm/lmgrd-amd64-${PV}.Z
+	          http://dev.gentoo.org/~eradicator/flexlm/lmutil-amd64-${PV}.Z )"
+
+# The ones in eradicator's devspace were originally:
+# ftp://ftp.globes.com/flexlm/unix/v${PV}/i86_s8/lmgrd.Z
+# ftp://ftp.globes.com/flexlm/unix/v${PV}/i86_s8/lmutil.Z
+# ftp://ftp.globes.com/flexlm/unix/v${PV}/amd64_s8/lmgrd.Z
+# ftp://ftp.globes.com/flexlm/unix/v${PV}/amd64_s8/lmutil.Z
+
+LICENSE="Macromedia"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="nostrip"
+
+DEPEND="virtual/libc"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+
+	mv lmutil-${ARCH}-${PV} lmutil
+	mv lmgrd-${ARCH}-${PV} lmgrd
+
+	cp ${DISTDIR}/enduser.pdf ${S}
+}
+
+src_install () {
+	# executables
+	dodir /opt/flexlm/bin
+	exeinto /opt/flexlm/bin
+	doexe lmgrd lmutil
+
+	dosym lmutil /opt/flexlm/bin/lmcksum
+	dosym lmutil /opt/flexlm/bin/lmdiag
+	dosym lmutil /opt/flexlm/bin/lmdown
+	dosym lmutil /opt/flexlm/bin/lmhostid
+	dosym lmutil /opt/flexlm/bin/lmremove
+	dosym lmutil /opt/flexlm/bin/lmreread
+	dosym lmutil /opt/flexlm/bin/lmstat
+	dosym lmutil /opt/flexlm/bin/lmver
+
+	# documentation
+	dodoc enduser.pdf
+
+	# init files
+	newinitd ${FILESDIR}/flexlm-init flexlm
+	newconfd ${FILESDIR}/flexlm-conf flexlm
+
+	# environment
+	doenvd ${FILESDIR}/90flexlm
+
+	# empty dir for licenses
+	keepdir /etc/flexlm
+}
+
+pkg_postinst() {
+	enewgroup flexlm
+	enewuser flexlm -1 /bin/bash /opt/flexlm flexlm -c "FlexLM server user"
+	einfo "FlexLM installed. Config is in /etc/conf.d/flexlm"
+	einfo "Default location for license file is /etc/flexlm/license.dat"
+}
diff --git a/app-admin/flexlm/flexlm-9.5.ebuild b/app-admin/flexlm/flexlm-9.5.ebuild
deleted file mode 100644
index 7105c3074708..000000000000
--- a/app-admin/flexlm/flexlm-9.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/flexlm/flexlm-9.5.ebuild,v 1.4 2005/04/24 06:53:09 wormo Exp $
-
-DESCRIPTION="Macrovision FLEXlm license manager and utils"
-HOMEPAGE="http://www.macrovision.com/services/support/flexlm/lmgrd.shtml"
-SRC_URI="ftp://ftp.globes.com/flexlm/unix/v${PV}/i86_s8/lmgrd.Z
-	ftp://ftp.globes.com/flexlm/unix/v${PV}/i86_s8/lmutil.Z
-	http://www.macrovision.com/services/support/flexlm/enduser.pdf"
-
-LICENSE="Macromedia"
-SLOT="0"
-KEYWORDS="~x86 -ppc"
-IUSE=""
-RESTRICT="nostrip nomirror"
-
-DEPEND="virtual/libc"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	cp ${DISTDIR}/enduser.pdf ${S}
-}
-
-src_install () {
-	# executables
-	dodir /opt/flexlm/bin
-	exeinto /opt/flexlm/bin
-	doexe lmgrd lmutil
-	# documentation
-	dodir /opt/flexlm/doc
-	insinto /opt/flexlm/doc
-	doins enduser.pdf
-	# init files
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/flexlm-init flexlm
-	# environment
-	insinto /etc/env.d
-	doins ${FILESDIR}/90flexlm
-	# config
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/flexlm-conf flexlm
-	# empty dir for licenses
-	dodir /etc/flexlm
-}
-
-pkg_postinst() {
-	enewuser flexlm -1 /bin/bash /opt/flexlm nogroup "FlexLM server user"
-	einfo "FlexLM installed. Config is in /etc/conf.d/flexlm"
-	einfo "Default location for license file is /etc/flexlm/license.dat"
-}