new version

(Portage version: 2.1_pre3-r1)

10 files changed, 44 insertions, 107 deletions

diff --git a/dev-util/tla/ChangeLog b/dev-util/tla/ChangeLog
index 5b2b483bae11..adc459a56eab 100644
--- a/dev-util/tla/ChangeLog
+++ b/dev-util/tla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/tla
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tla/ChangeLog,v 1.33 2005/12/16 11:13:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/tla/ChangeLog,v 1.34 2006/01/07 01:56:43 arj Exp $
+
+*tla-1.3.4 (06 Jan 2006)
+
+  06 Jan 2006; Anders Rune Jensen <arj@gentoo.org> +tla-1.3.4.ebuild, -tla-1.3.2, -tla-1.3.1_p1:
+  New version. Remove old versions
 
   16 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> tla-1.3.3-r1.ebuild:
   Remove GNUish cp -a call. Bug #103487.
diff --git a/dev-util/tla/Manifest b/dev-util/tla/Manifest
index 36c69a733913..b1d939c90bbb 100644
--- a/dev-util/tla/Manifest
+++ b/dev-util/tla/Manifest
@@ -1,25 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b936b8cf28380b69fcaec95cb83eaf48 ChangeLog 4970
+MD5 3d829b3d163334d238674cd7f985370c ChangeLog 5129
 MD5 aebb0589c17a49327161706be094be85 files/digest-tla-1.2-r2 121
 MD5 8083bfc60d40ae031c9f568f227b8ff3 files/digest-tla-1.3 60
-MD5 8e6da446c0da20fa727f23883adeb2a7 files/digest-tla-1.3.1_p1 120
-MD5 f66bfec49fdc3ffa6d296862dc06a190 files/digest-tla-1.3.2 114
 MD5 d522e2019220b1c2f21e54a9b159080b files/digest-tla-1.3.3 116
 MD5 d522e2019220b1c2f21e54a9b159080b files/digest-tla-1.3.3-r1 116
+MD5 ee5ab8ed7926f91fbb3d125912b40788 files/digest-tla-1.3.4 116
 MD5 8510cb99570c9ba241975846613ce885 files/tla-1.3-gcc-4-fix.patch 475
 MD5 2f5e4bc80a59c9c3e33b3b68f5c151f4 metadata.xml 276
-MD5 43a91b1747f41d424bc9e73019a020ff tla-1.2-r2.ebuild 1663
-MD5 c2c6db34ed35fb17cd316f4295546106 tla-1.3.1_p1.ebuild 1410
-MD5 88f0f8e0bd5938a0876b7cb047b73b89 tla-1.3.2.ebuild 1529
-MD5 20be71639fb0a943f5e81c2a5f6578ed tla-1.3.3-r1.ebuild 1659
-MD5 dc72dd80a4dbbde322573db62b39df92 tla-1.3.3.ebuild 1533
+MD5 afd9ce5971de6879c37b794ae7011104 tla-1.2-r2.ebuild 1665
+MD5 fd519657ac66bfb07105246fd46c6027 tla-1.3.3-r1.ebuild 1659
+MD5 3416c42d02cde5adfe3b771d18e04284 tla-1.3.3.ebuild 1535
+MD5 fd519657ac66bfb07105246fd46c6027 tla-1.3.4.ebuild 1659
 MD5 6d4a102024a4ab8998c91a5e7ab7c4c2 tla-1.3.ebuild 1241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDoqFWAiZjviIA2XgRAsEdAKCIcu3y2WCQd2GhiWEGn0jYS4MzTgCfdnm9
-pOa2tWy35pYS2mtxGop0Pr0=
-=syur
------END PGP SIGNATURE-----
diff --git a/dev-util/tla/files/digest-tla-1.3.1_p1 b/dev-util/tla/files/digest-tla-1.3.1_p1
deleted file mode 100644
index 7be9e56bb218..000000000000
--- a/dev-util/tla/files/digest-tla-1.3.1_p1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bab3b300176c5d038e190602eac40e86 tla-1.3.1-fix-1.tar.gz 4185386
-MD5 6d3c150ef3132e947c5c21184c53b02b tla.1.gz 19823
diff --git a/dev-util/tla/files/digest-tla-1.3.2 b/dev-util/tla/files/digest-tla-1.3.2
deleted file mode 100644
index 1b1a1ba0ad5a..000000000000
--- a/dev-util/tla/files/digest-tla-1.3.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6dde0631a56b389768172cf089bbdc3a tla-1.3.2.tar.gz 3965027
-MD5 6d3c150ef3132e947c5c21184c53b02b tla.1.gz 19823
diff --git a/dev-util/tla/files/digest-tla-1.3.4 b/dev-util/tla/files/digest-tla-1.3.4
new file mode 100644
index 000000000000..b13433635af5
--- /dev/null
+++ b/dev-util/tla/files/digest-tla-1.3.4
@@ -0,0 +1,2 @@
+MD5 9c6026bd37cab999368f8fa9c2fa7002 tla-1.3.4.tar.gz 3714355
+MD5 5d98adeb7875772e908c45711c79e4a4 tla.1-2.gz 19101
diff --git a/dev-util/tla/tla-1.2-r2.ebuild b/dev-util/tla/tla-1.2-r2.ebuild
index b7df81f459be..edec5111fa92 100644
--- a/dev-util/tla/tla-1.2-r2.ebuild
+++ b/dev-util/tla/tla-1.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tla/tla-1.2-r2.ebuild,v 1.7 2005/04/03 18:19:14 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/tla/tla-1.2-r2.ebuild,v 1.8 2006/01/07 01:56:43 arj Exp $
 
 inherit eutils
 
@@ -63,5 +63,5 @@ src_install () {
 	dohtml -r html/
 
 	chmod 755 "${WORKDIR}/${MY_P}/src/tla/=gpg-check.awk"
-	cp -a "${WORKDIR}/${MY_P}/src/tla/=gpg-check.awk" "${D}/usr/bin/tla-gpg-check.awk"
+	cp -pPR "${WORKDIR}/${MY_P}/src/tla/=gpg-check.awk" "${D}/usr/bin/tla-gpg-check.awk"
 }
diff --git a/dev-util/tla/tla-1.3.1_p1.ebuild b/dev-util/tla/tla-1.3.1_p1.ebuild
deleted file mode 100644
index 9a6221a26b11..000000000000
--- a/dev-util/tla/tla-1.3.1_p1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tla/tla-1.3.1_p1.ebuild,v 1.3 2005/05/08 19:47:34 arj Exp $
-
-inherit eutils
-
-MY_P="${P/_p/-fix-}"
-S="${WORKDIR}/${MY_P}/src/=build"
-DESCRIPTION="Revision control system ideal for widely distributed development"
-SRC_URI="mirror://gnu/gnu-arch/${MY_P}.tar.gz
-	http://dev.gentoo.org/~arj/tla.1.gz"
-HOMEPAGE="http://savannah.gnu.org/projects/gnu-arch http://wiki.gnuarch.org/ http://arch.quackerhead.com/~lord/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~ppc ~hppa ~sparc ~amd64"
-IUSE=""
-
-DEPEND="sys-apps/coreutils
-	sys-apps/diffutils
-	sys-devel/patch
-	sys-apps/findutils
-	sys-apps/gawk
-	app-arch/tar
-	sys-apps/util-linux
-	sys-apps/debianutils
-	sys-devel/make"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	unpack tla.1.gz
-	mkdir "${S}"
-	cd "${WORKDIR}/${MY_P}"
-	epatch ${FILESDIR}/tla-1.3-gcc-4-fix.patch
-}
-
-src_compile() {
-	../configure \
-		--prefix="/usr" \
-		--with-posix-shell="/bin/bash"	|| die "configure failed"
-	# parallel make may cause problems with this package
-	make || die "make failed"
-}
-
-src_install () {
-	make install prefix="${D}/usr" \
-		|| die "make install failed"
-
-	cd ${S}/../..
-	dodoc =README
-	cd ${S}/..
-	dodoc COPYING
-	dodoc ChangeLog
-	cd docs-tla
-	docinto ps
-	dodoc ps/*.ps
-	docinto html
-	dohtml -r html/
-	cd ${WORKDIR}
-	doman tla.1
-}
diff --git a/dev-util/tla/tla-1.3.3-r1.ebuild b/dev-util/tla/tla-1.3.3-r1.ebuild
index b73e1deea979..532927c96210 100644
--- a/dev-util/tla/tla-1.3.3-r1.ebuild
+++ b/dev-util/tla/tla-1.3.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tla/tla-1.3.3-r1.ebuild,v 1.3 2005/12/16 11:13:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/tla/tla-1.3.3-r1.ebuild,v 1.4 2006/01/07 01:56:43 arj Exp $
 
 S="${WORKDIR}/${P}/src/=build"
 DESCRIPTION="Revision control system ideal for widely distributed development"
diff --git a/dev-util/tla/tla-1.3.3.ebuild b/dev-util/tla/tla-1.3.3.ebuild
index 673f4221f468..2f882e2982d9 100644
--- a/dev-util/tla/tla-1.3.3.ebuild
+++ b/dev-util/tla/tla-1.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tla/tla-1.3.3.ebuild,v 1.1 2005/06/03 10:48:00 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/tla/tla-1.3.3.ebuild,v 1.2 2006/01/07 01:56:43 arj Exp $
 
 S="${WORKDIR}/${P}/src/=build"
 DESCRIPTION="Revision control system ideal for widely distributed development"
@@ -57,5 +57,5 @@ src_install () {
 	doman tla.1
 
 	chmod 755 "${WORKDIR}/${P}/src/tla/=gpg-check.awk"
-	cp -a "${WORKDIR}/${P}/src/tla/=gpg-check.awk" "${D}/usr/bin/tla-gpg-check.awk"
+	cp -pPR "${WORKDIR}/${P}/src/tla/=gpg-check.awk" "${D}/usr/bin/tla-gpg-check.awk"
 }
diff --git a/dev-util/tla/tla-1.3.2.ebuild b/dev-util/tla/tla-1.3.4.ebuild
index f2d752f40590..0427d49906d5 100644
--- a/dev-util/tla/tla-1.3.2.ebuild
+++ b/dev-util/tla/tla-1.3.4.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tla/tla-1.3.2.ebuild,v 1.1 2005/05/08 19:47:34 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/tla/tla-1.3.4.ebuild,v 1.1 2006/01/07 01:56:43 arj Exp $
 
 S="${WORKDIR}/${P}/src/=build"
 DESCRIPTION="Revision control system ideal for widely distributed development"
 SRC_URI="mirror://gnu/gnu-arch/${P}.tar.gz
-	http://dev.gentoo.org/~arj/tla.1.gz"
+	http://dev.gentoo.org/~arj/tla.1-2.gz"
 HOMEPAGE="http://savannah.gnu.org/projects/gnu-arch http://wiki.gnuarch.org/ http://arch.quackerhead.com/~lord/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~ppc ~hppa ~sparc ~amd64"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc-macos ~sparc ~x86"
+IUSE="doc"
 
 DEPEND="sys-apps/coreutils
 	sys-apps/diffutils
@@ -19,13 +19,13 @@ DEPEND="sys-apps/coreutils
 	sys-apps/findutils
 	sys-apps/gawk
 	app-arch/tar
-	sys-apps/util-linux
+	!ppc-macos? ( sys-apps/util-linux )
 	sys-apps/debianutils
 	sys-devel/make"
 
 src_unpack() {
 	unpack ${P}.tar.gz
-	unpack tla.1.gz
+	unpack tla.1-2.gz
 	mkdir "${S}"
 	cd "${WORKDIR}/${P}"
 	sed -i 's:/home/lord/{install}:/usr:g' "${WORKDIR}/${P}/src/tla/=gpg-check.awk"
@@ -43,19 +43,26 @@ src_install () {
 	make install prefix="${D}/usr" \
 		|| die "make install failed"
 
-	cd ${S}/../..
-	dodoc =README
 	cd ${S}/..
 	dodoc COPYING
 	dodoc ChangeLog
-	cd docs-tla
-	docinto ps
-	dodoc ps/*.ps
-	docinto html
-	dohtml -r html/
+
+	if use doc; then
+		cd docs-tla
+		docinto html
+		dohtml -r .
+
+		cd ../docs-hackerlab
+		docinto hackerlab/html
+		dohtml html/*
+		docinto hackerlab/ps
+		dodoc ps/*
+	fi
+
 	cd ${WORKDIR}
+	mv tla.1-2 tla.1
 	doman tla.1
 
 	chmod 755 "${WORKDIR}/${P}/src/tla/=gpg-check.awk"
-	cp -a "${WORKDIR}/${P}/src/tla/=gpg-check.awk" "${D}/usr/bin/tla-gpg-check.awk"
+	cp -pPR "${WORKDIR}/${P}/src/tla/=gpg-check.awk" "${D}/usr/bin/tla-gpg-check.awk"
 }