confict with app-text/agrep noted. Bug #71795

7 files changed, 16 insertions, 113 deletions

diff --git a/dev-libs/tre/ChangeLog b/dev-libs/tre/ChangeLog
index a7c85405fb46..040a91e1600e 100644
--- a/dev-libs/tre/ChangeLog
+++ b/dev-libs/tre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/tre
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tre/ChangeLog,v 1.10 2004/10/28 09:25:20 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tre/ChangeLog,v 1.11 2004/11/21 10:51:27 dragonheart Exp $
+
+  21 Nov 2004; Daniel Black <dragonheart@gentoo.org> -tre-0.6.6.ebuild,
+  -tre-0.6.8.ebuild, tre-0.7.0.ebuild:
+  confict with app-text/agrep noted. Added x86 and ppc keywords. Bug #71795
+  refers. Thanks to ukenshiro@ngi.it for the bug report
 
 *tre-0.7.0 (28 Oct 2004)
 
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index be203e0db556..8961c67d74e9 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b74741d12396484d867af85095a16eab ChangeLog 1660
+MD5 7a3a954d893062df6e0cb53dbf79617e ChangeLog 1904
 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
-MD5 f4d092dfebacb0a81b338b4ec32098e0 tre-0.6.6.ebuild 965
-MD5 149bf747125ab5add54cc4d5454b2239 tre-0.6.8.ebuild 1194
-MD5 f4e88f2f987f21c58ffd6515af5f06a0 tre-0.7.0.ebuild 1200
-MD5 50afdfdea1dbb2f1cbf0fedb7d127e4a files/digest-tre-0.6.8 62
-MD5 b60e1dc7ab6d96f81c2428eb26320ac1 files/digest-tre-0.6.6 62
+MD5 75b56cf69ce4acf5b3540df54ac153b1 tre-0.7.0.ebuild 1231
 MD5 6e56039a6668c1f9a9c58117436ae97e files/digest-tre-0.7.0 62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBgLsGmdTrptrqvGERApXkAJ42gCx3rFJfTTPoeF0NkWleQfZbAgCfQJbw
-+W1089WViYJMx0CwcXnyjik=
-=yWfI
+iD8DBQFBoHM1mdTrptrqvGERAjlYAJ44ILJLSlRHevkAgBIU7LnW/7CW2wCfQErg
++S6XssuIzEi2Jri7q32tYJI=
+=Ngmt
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/tre/files/digest-tre-0.6.6 b/dev-libs/tre/files/digest-tre-0.6.6
deleted file mode 100644
index d0553fa63585..000000000000
--- a/dev-libs/tre/files/digest-tre-0.6.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f94a3a211dbf0d77a72550c5d5d827e4 tre-0.6.6.tar.bz2 316905
diff --git a/dev-libs/tre/files/digest-tre-0.6.8 b/dev-libs/tre/files/digest-tre-0.6.8
deleted file mode 100644
index 6e49cdbba5a6..000000000000
--- a/dev-libs/tre/files/digest-tre-0.6.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f6245a160b43e595b3aa98d591d00ad tre-0.6.8.tar.bz2 327470
diff --git a/dev-libs/tre/tre-0.6.6.ebuild b/dev-libs/tre/tre-0.6.6.ebuild
deleted file mode 100644
index de12420d29ce..000000000000
--- a/dev-libs/tre/tre-0.6.6.ebuild
+++ /dev/null
@@ -1,45 +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/tre/tre-0.6.6.ebuild,v 1.6 2004/07/02 04:56:12 eradicator Exp $
-
-IUSE="nls static"
-
-DESCRIPTION="Lightweight, robust, and efficient POSIX compliant regexp matching library."
-HOMEPAGE="http://laurikari.net/tre/index.html"
-SRC_URI="http://laurikari.net/tre/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-
-DEPEND="virtual/libc
-	sys-apps/gawk
-	sys-apps/grep
-	sys-apps/sed
-	sys-devel/gettext
-	sys-devel/libtool
-	sys-devel/gcc
-	dev-util/pkgconfig"
-
-RDEPEND="virtual/libc
-	!app-misc/glimpse"
-
-src_compile() {
-	# Build TRE library.
-	cd ${S}
-	econf \
-		`use_enable nls` \
-		`use_enable static` \
-		--enable-agrep \
-		--enable-system-abi \
-		--disable-profile \
-		--disable-debug || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	cd ${S}
-	dohtml doc/tre-api.html doc/tre-syntax.html
-}
-
diff --git a/dev-libs/tre/tre-0.6.8.ebuild b/dev-libs/tre/tre-0.6.8.ebuild
deleted file mode 100644
index 2a11d16e327c..000000000000
--- a/dev-libs/tre/tre-0.6.8.ebuild
+++ /dev/null
@@ -1,52 +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/tre/tre-0.6.8.ebuild,v 1.6 2004/09/03 22:40:47 slarti Exp $
-
-IUSE="nls static"
-
-DESCRIPTION="Lightweight, robust, and efficient POSIX compliant regexp matching library."
-HOMEPAGE="http://laurikari.net/tre/index.html"
-SRC_URI="http://laurikari.net/tre/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~amd64"
-
-DEPEND="virtual/libc
-	sys-apps/gawk
-	sys-apps/grep
-	sys-apps/sed
-	sys-devel/gettext
-	sys-devel/libtool
-	sys-devel/gcc
-	dev-util/pkgconfig"
-
-RDEPEND="virtual/libc
-	!app-misc/glimpse"
-
-src_compile() {
-	# Build TRE library.
-	cd ${S}
-	econf \
-		`use_enable nls` \
-		`use_enable static` \
-		--enable-agrep \
-		--enable-system-abi \
-		--disable-profile \
-		--disable-debug || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die
-	cd ${S}
-	dohtml doc/tre-api.html doc/tre-syntax.html
-}
-
-
-pkg_postinst() {
-	ewarn "Both app-misc/glimpse and this package provide agrep."
-	ewarn "they seem to be similar but just to let you know."
-	ewarn "If this causes a problem please do a bug report"
-	ewarn "bugs.gentoo.org."
-}
diff --git a/dev-libs/tre/tre-0.7.0.ebuild b/dev-libs/tre/tre-0.7.0.ebuild
index 55b153bbbac8..6b81f7967735 100644
--- a/dev-libs/tre/tre-0.7.0.ebuild
+++ b/dev-libs/tre/tre-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tre/tre-0.7.0.ebuild,v 1.1 2004/10/28 09:25:20 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tre/tre-0.7.0.ebuild,v 1.2 2004/11/21 10:51:27 dragonheart Exp $
 
 IUSE="nls static"
 
@@ -10,7 +10,7 @@ SRC_URI="http://laurikari.net/tre/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ppc ~amd64"
 
 DEPEND="virtual/libc
 	sys-apps/gawk
@@ -22,7 +22,8 @@ DEPEND="virtual/libc
 	dev-util/pkgconfig"
 
 RDEPEND="virtual/libc
-	!app-misc/glimpse"
+	!app-misc/glimpse
+	!app-text/agrep"
 
 src_compile() {
 	# Build TRE library.
@@ -45,7 +46,7 @@ src_install() {
 
 
 pkg_postinst() {
-	ewarn "Both app-misc/glimpse and this package provide agrep."
+	ewarn "Both app-misc/glimpse, app-text/agrep and this package provide agrep."
 	ewarn "they seem to be similar but just to let you know."
 	ewarn "If this causes a problem please do a bug report"
 	ewarn "bugs.gentoo.org."