Changed installation path from /usr/X11R6 to /usr; bug #90796.

(Portage version: 2.0.52-r1)

6 files changed, 39 insertions, 5 deletions

diff --git a/x11-libs/neXtaw/ChangeLog b/x11-libs/neXtaw/ChangeLog
index 6c6a1595e076..465b9ab2ba7b 100644
--- a/x11-libs/neXtaw/ChangeLog
+++ b/x11-libs/neXtaw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/neXtaw
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/neXtaw/ChangeLog,v 1.13 2005/03/29 14:10:11 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/neXtaw/ChangeLog,v 1.14 2005/09/29 08:54:00 usata Exp $
+
+*neXtaw-0.15.1-r1 (29 Sep 2005)
+
+  29 Sep 2005; Mamoru KOMACHI <usata@gentoo.org> neXtaw-0.12.ebuild,
+  neXtaw-0.15.1.ebuild, +neXtaw-0.15.1-r1.ebuild:
+  Changed installation path from /usr/X11R6 to /usr; bug #90796.
 
   29 Mar 2005; Guy Martin <gmsoft@gentoo.org> neXtaw-0.12.ebuild,
   neXtaw-0.15.1.ebuild:
diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
index 164ce1680f1c..d08c914881da 100644
--- a/x11-libs/neXtaw/Manifest
+++ b/x11-libs/neXtaw/Manifest
@@ -1,5 +1,7 @@
 MD5 d05d05ab0b510b63235f05b3cc01353b ChangeLog 1329
 MD5 dc98bf77a8df106f19f64a6870ae5d38 neXtaw-0.12.ebuild 733
 MD5 61c211e8264d080ac2f37f6f2883a953 neXtaw-0.15.1.ebuild 767
+MD5 77c22a28fdc52b7428ccd9ce653aa77f neXtaw-0.15.1-r1.ebuild 638
 MD5 bc5549fb1bff5f7a480d56d9cde31262 files/digest-neXtaw-0.12 63
 MD5 1c3dd4595fe26cb0d47924d98df607ba files/digest-neXtaw-0.15.1 65
+MD5 1c3dd4595fe26cb0d47924d98df607ba files/digest-neXtaw-0.15.1-r1 65
diff --git a/x11-libs/neXtaw/files/digest-neXtaw-0.15.1-r1 b/x11-libs/neXtaw/files/digest-neXtaw-0.15.1-r1
new file mode 100644
index 000000000000..37c4f5b3a7c8
--- /dev/null
+++ b/x11-libs/neXtaw/files/digest-neXtaw-0.15.1-r1
@@ -0,0 +1 @@
+MD5 1c9cbcef735d8e26f3e48bd529aca6a7 neXtaw-0.15.1.tar.gz 577459
diff --git a/x11-libs/neXtaw/neXtaw-0.12.ebuild b/x11-libs/neXtaw/neXtaw-0.12.ebuild
index 509c2210dc77..e2aa284e9a00 100644
--- a/x11-libs/neXtaw/neXtaw-0.12.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/neXtaw/neXtaw-0.12.ebuild,v 1.14 2005/03/29 14:10:11 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/neXtaw/neXtaw-0.12.ebuild,v 1.15 2005/09/29 08:54:00 usata Exp $
 
 DESCRIPTION="Athena Widgets with N*XTSTEP appearance"
 HOMEPAGE="http://siag.nu/neXtaw/"
@@ -9,7 +9,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="x86 sparc alpha ia64 amd64 ppc ppc64 hppa"
 IUSE=""
-DEPEND="virtual/x11"
+DEPEND="virtual/x11
+	!>=net-libs/neXtaw-0.15.1-r1"
 
 src_compile() {
 	./configure \
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild
new file mode 100644
index 000000000000..b922ac42d327
--- /dev/null
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild,v 1.1 2005/09/29 08:54:00 usata Exp $
+
+DESCRIPTION="Athena Widgets with N*XTSTEP appearance"
+HOMEPAGE="http://siag.nu/neXtaw/"
+SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE=""
+DEPEND="virtual/x11
+	!<x11-libs/neXtaw-0.15.1-r1"
+
+src_compile() {
+	econf || die
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+}
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1.ebuild
index 8452faafbcb8..6bdc18af12b1 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/neXtaw/neXtaw-0.15.1.ebuild,v 1.2 2005/03/29 14:10:11 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/neXtaw/neXtaw-0.15.1.ebuild,v 1.3 2005/09/29 08:54:00 usata Exp $
 
 DESCRIPTION="Athena Widgets with N*XTSTEP appearance"
 HOMEPAGE="http://siag.nu/neXtaw/"
@@ -9,7 +9,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~alpha ~ia64 ~amd64 ~ppc ~ppc64 ~ppc-macos ~hppa"
 IUSE=""
-DEPEND="virtual/x11"
+DEPEND="virtual/x11
+	!>=x11-libs/neXtaw-0.15.1-r1"
 
 src_compile() {
 	./configure \