5 files changed, 23 insertions, 85 deletions
diff --git a/dev-libs/libots/ChangeLog b/dev-libs/libots/ChangeLog
index a714ce25478c..f61703b3ca55 100644
--- a/dev-libs/libots/ChangeLog
+++ b/dev-libs/libots/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libots
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libots/ChangeLog,v 1.15 2007/12/25 15:57:33 phreak Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libots/ChangeLog,v 1.16 2008/05/05 13:06:50 drac Exp $
+
+  05 May 2008; Samuli Suominen <drac@gentoo.org> -libots-2.2.7.ebuild,
+  -libots-2.2.7-r1.ebuild, libots-2.2.7-r2.ebuild:
+  New ebuild partly from bug 216606, thanks to Matt Turner.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing taviso from metadata.xml as per #202471. Assigning to
diff --git a/dev-libs/libots/Manifest b/dev-libs/libots/Manifest
index c8deaa9e2bc6..463be6ec1db4 100644
--- a/dev-libs/libots/Manifest
+++ b/dev-libs/libots/Manifest
@@ -1,6 +1,4 @@
 DIST libots-2.2.7-2.alpha.rpm 94336 RMD160 ac17689a543dcb5097c35229267f04fe5856bf42 SHA1 f266cfa5b837e14d3cac20659e55dedaa52e5dc5 SHA256 32e6e49d8bc4faf1b5c250cb764c124833947fa16c7f96ea6b23fb4d96030530
-EBUILD libots-2.2.7-r1.ebuild 795 RMD160 62c9a0b0e22a7faffe616d1d273d8074c8a77d8f SHA1 fa81a132b35a618856474b0830fefb5361ff4a37 SHA256 129f0d538168d7b2da734410561d45dc7ed6a80e44bf684f4a35f7be83d86508
-EBUILD libots-2.2.7-r2.ebuild 721 RMD160 4dcff394a737f2955a7134157a933de6e29fd636 SHA1 1aa228fd3ab653de4bb504b4ed8cebc82415c385 SHA256 4e72eca1b4d4091a92454901a99c5ab2c31e8ac1e0354ba0e5c295e9a5a8c143
-EBUILD libots-2.2.7.ebuild 871 RMD160 0795e16690ab5e028929b26ac6d7973889632e05 SHA1 6f1b945ad12bae9bcf90a377e15572cbf42830f5 SHA256 72625ab46d00bc01eb8e4529027532ebcd58ddf013f61b4ee0803a9c791292b1
-MISC ChangeLog 1521 RMD160 72e6c0defe945731f9ff1df55dd8e379252b1553 SHA1 efbf37b6913b6ea1fbd477d698c62040de39fd81 SHA256 a54f147206746af30bdc9ac826c8e8cdfd8abdbdc58fe84cf9c145f6360f0350
+EBUILD libots-2.2.7-r2.ebuild 714 RMD160 643560d6de26e4900bde6021c355be9b72438b05 SHA1 f9ca30fdbffc817b3ef2fdb41e07100e7a48a9e4 SHA256 87ede4342f0924e40ef7bbeb8c6e86bfc152a6c10b10477a4817c005ba0f2330
+MISC ChangeLog 1702 RMD160 f48a4ba32fef6636795df816810700c76ad9969c SHA1 05d051834611ab3b240fcc4334ecf92066d51bb2 SHA256 eac6a1676099890aa7c23549b5a4d4311e1f828c24b04f05b3d1c8fff8a58f41
 MISC metadata.xml 383 RMD160 bd7ac45c3d1f37d81679c265d2333a8b705f8a16 SHA1 da98a7db62897af544093e1fca03eb19846fd6f5 SHA256 8029554305ccd5d12a6c0018db3274c0c331e7b0d03a6b62fc61d4d49a8ea779
diff --git a/dev-libs/libots/libots-2.2.7-r1.ebuild b/dev-libs/libots/libots-2.2.7-r1.ebuild
deleted file mode 100644
index c4f8aed07000..000000000000
--- a/dev-libs/libots/libots-2.2.7-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libots/libots-2.2.7-r1.ebuild,v 1.4 2004/07/14 14:45:13 agriffis Exp $
-
-At="libots-2.2.7-2.alpha.rpm"
-S=${WORKDIR}/usr/lib/compaq/libots-2.2.7
-SRC_URI="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/${At}"
-DESCRIPTION="Compaq Linux optimized runtime for Alpha/Linux/GNU"
-HOMEPAGE="http://www.support.compaq.com/alpha-tools/"
-DEPEND="virtual/libc
-	app-arch/rpm2targz "
-RDEPEND="$DEPEND"
-LICENSE="compaq-sdla"
-SLOT="2.2.7"
-KEYWORDS="-* ~alpha"
-IUSE=""
-
-src_unpack() {
-	rpm2targz ${DISTDIR}/${At} || die
-	tar zxf libots-2.2.7-2.alpha.tar.gz || die
-}
-
-src_install () {
-	dodir /lib || die
-	cp libots.* ${D}/lib || die
-	dodoc README || die
-}
diff --git a/dev-libs/libots/libots-2.2.7-r2.ebuild b/dev-libs/libots/libots-2.2.7-r2.ebuild
index 7c93e482b9b9..da36d65e0c8f 100644
--- a/dev-libs/libots/libots-2.2.7-r2.ebuild
+++ b/dev-libs/libots/libots-2.2.7-r2.ebuild
@@ -1,32 +1,27 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libots/libots-2.2.7-r2.ebuild,v 1.6 2007/07/02 14:59:01 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libots/libots-2.2.7-r2.ebuild,v 1.7 2008/05/05 13:06:50 drac Exp $
 
-inherit eutils rpm
+inherit rpm toolchain-funcs
 
-At="libots-2.2.7-2.alpha.rpm"
-HOMEPAGE="http://www.support.compaq.com/alpha-tools/"
-DESCRIPTION="Compaq Linux optimized runtime for Alpha/Linux/GNU"
-SRC_URI="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/${At}"
+DESCRIPTION="Compaq's Optimized Runtime Library for the Alpha Platform"
+HOMEPAGE="ftp://ftp.compaq.com/pub/products/C-CXX/linux/"
+SRC_URI="ftp://ftp.compaq.com/pub/products/C-CXX/linux/libots-2.2.7-2.alpha.rpm"
 
-DEPEND="virtual/libc"
 LICENSE="compaq-sdla"
-SLOT="2.2.7"
+SLOT="0"
 KEYWORDS="-* alpha"
-IUSE=""
-
-S=${WORKDIR}/usr/lib/compaq/libots-2.2.7
-
 RESTRICT="strip"
 
-src_unpack() {
-	rpm_src_unpack
-}
+DEPEND="app-arch/rpm2targz"
+RDEPEND=""
 
-src_install () {
-	into /
-	dolib.so libots.so
-	dolib.a libots.a
+S=${WORKDIR}/usr/lib/compaq/libots-2.2.7
 
+src_install() {
+	dolib.a ${PN}.a
 	dodoc README
+	into /
+	dolib.so ${PN}.so
+	gen_usr_ldscript ${PN}.so
 }
diff --git a/dev-libs/libots/libots-2.2.7.ebuild b/dev-libs/libots/libots-2.2.7.ebuild
deleted file mode 100644
index 77c15a9e0439..000000000000
--- a/dev-libs/libots/libots-2.2.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libots/libots-2.2.7.ebuild,v 1.9 2004/07/14 14:45:13 agriffis Exp $
-
-At="libots-2.2.7-2.alpha.rpm"
-S=${WORKDIR}/usr/lib/compaq/libots-2.2.7
-SRC_URI="ftp://ftp.compaq.com/pub/products/linuxdevtools/latest/${At}"
-DESCRIPTION="Compaq Linux optimized runtime for Alpha/Linux/GNU"
-HOMEPAGE="http://www.support.compaq.com/alpha-tools/"
-DEPEND="virtual/libc
-	app-arch/rpm2targz "
-RDEPEND="$DEPEND"
-LICENSE="compaq-sdla"
-SLOT="2.2.7"
-KEYWORDS="-x86 -ppc -sparc alpha"
-IUSE=""
-
-src_unpack() {
-	#if [ ! -f ${DISTDIR}/${At} ] ; then
-	#	die "Please download ${At} from ${HOMEPAGE}"
-	#fi
-	rpm2targz ${DISTDIR}/${At}
-	tar zxf libots-2.2.7-2.alpha.tar.gz
-}
-
-src_install () {
-	dodir /usr/lib
-
-	cp libots.* ${D}/usr/lib
-
-	dodoc README
-}