Fix typo in deps. Bug # 121753. Thanks Ciaran. Remove non-modular X ebuild.

Package-Manager: portage-2.1_pre4-r1

6 files changed, 26 insertions, 98 deletions

diff --git a/x11-wm/ion2/ChangeLog b/x11-wm/ion2/ChangeLog
index aa590c199f90..a99157684766 100644
--- a/x11-wm/ion2/ChangeLog
+++ b/x11-wm/ion2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/ion2
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.28 2006/01/25 17:18:43 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.29 2006/02/07 09:11:22 twp Exp $
+
+  07 Feb 2006; Tom Payne <twp@gentoo.org> -ion2-20040729.ebuild,
+  ion2-20040729-r1.ebuild:
+  Fix typo in deps. Bug # 121753. Thanks Ciaran. Remove non-modular X ebuild.
 
   25 Jan 2006; Tom Payne <twp@gentoo.org> ion2-20040729-r1.ebuild:
   Further updates for Modular X.
diff --git a/x11-wm/ion2/Manifest b/x11-wm/ion2/Manifest
index d17a7b9c3e75..627b6065a6a6 100644
--- a/x11-wm/ion2/Manifest
+++ b/x11-wm/ion2/Manifest
@@ -1,9 +1,21 @@
-MD5 581a3e285576fd734c3c7b05c69f8f79 ChangeLog 3413
-MD5 59a0157884665387039b7de882e85f1c files/digest-ion2-20040729 66
-MD5 59a0157884665387039b7de882e85f1c files/digest-ion2-20040729-r1 66
+MD5 b2cc382fc3824d0c2062a7a3d89b167c ChangeLog 3584
+RMD160 bb1f73826bae640182259d06d4f2e4988db14914 ChangeLog 3584
+SHA256 d44289dc7df7ddbe0f3c0862c63abdb5306312526c7a6a9ce45f0280d0775de0 ChangeLog 3584
+MD5 f3ebd663dc1dc09567e0b4ea2971725a files/digest-ion2-20040729-r1 244
+RMD160 4cd91005b2dae8c4b6748e55f370af02a85ecbbc files/digest-ion2-20040729-r1 244
+SHA256 f55335d24368ee3edfe03f53143d13d918bd94192b98854cb3797f7ec9e3746f files/digest-ion2-20040729-r1 244
 MD5 7057ed0ec950ad5f77b47a32dbcb4fb4 files/ion2-20040601-rename.patch 1720
+RMD160 c940bd36dddc88a7d98f3e8f576adad59e1e156b files/ion2-20040601-rename.patch 1720
+SHA256 046389d75b070e52a4afa3766e8d738182fc6abdaf69764c4cfb8652be03e6bd files/ion2-20040601-rename.patch 1720
 MD5 fba46fa26a6acc7159f6eb942abc002d files/ion2.desktop 217
+RMD160 238c19baeaa5288cd83aab15da9d9162fe5bd3f7 files/ion2.desktop 217
+SHA256 db71a3e352193ed31ee22c874fecfe05c6c9e4d44a6adb34e969d03cb1020acb files/ion2.desktop 217
 MD5 fece066216c6fcfa1936d068bd6ca998 files/pwm2.desktop 170
-MD5 ce612b81e395207ef6facc3adf59a3dd ion2-20040729-r1.ebuild 2318
-MD5 b5d59197edcbfc5b059667c2b08d8c32 ion2-20040729.ebuild 2051
+RMD160 a0d5d34a38c54de041db51ebb167b8f4cfa1159d files/pwm2.desktop 170
+SHA256 53df797603fff8ad71b4500fcf9f7c0f1e8a864ceae45785f97c4e7dd9b5e957 files/pwm2.desktop 170
+MD5 a0264a8aa93a24175b65d96505f57f31 ion2-20040729-r1.ebuild 2319
+RMD160 f26886025bb67010c0fdb3fd8f276a92c1c9f5bb ion2-20040729-r1.ebuild 2319
+SHA256 af688d9441586160803887a94443c6f767003b18de8037426e75d46bb965e928 ion2-20040729-r1.ebuild 2319
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
+RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d metadata.xml 244
+SHA256 c7b6d3457d4746a2b281c4ac598bcf78b8e1553d8d63f2523b4cd0f4eaa422b1 metadata.xml 244
diff --git a/x11-wm/ion2/files/digest-ion2-20040729 b/x11-wm/ion2/files/digest-ion2-20040729
deleted file mode 100644
index fd49e44d2445..000000000000
--- a/x11-wm/ion2/files/digest-ion2-20040729
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d7d98baa41635c1989e423adf76eb2ac ion-2-20040729.tar.gz 399367
diff --git a/x11-wm/ion2/files/digest-ion2-20040729-r1 b/x11-wm/ion2/files/digest-ion2-20040729-r1
index fd49e44d2445..fb6b2e344972 100644
--- a/x11-wm/ion2/files/digest-ion2-20040729-r1
+++ b/x11-wm/ion2/files/digest-ion2-20040729-r1
@@ -1 +1,3 @@
 MD5 d7d98baa41635c1989e423adf76eb2ac ion-2-20040729.tar.gz 399367
+RMD160 a32053c744cc130d9feb07f64bf3fef6cb4fa0c7 ion-2-20040729.tar.gz 399367
+SHA256 8c8b7ef0cc6a98d409bde1b9b3f5159a2e632b4e78768e13cca0da174649a162 ion-2-20040729.tar.gz 399367
diff --git a/x11-wm/ion2/ion2-20040729-r1.ebuild b/x11-wm/ion2/ion2-20040729-r1.ebuild
index dfbb3508b049..baf55c4a8dae 100644
--- a/x11-wm/ion2/ion2-20040729-r1.ebuild
+++ b/x11-wm/ion2/ion2-20040729-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ion2-20040729-r1.ebuild,v 1.2 2006/01/25 17:18:43 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ion2-20040729-r1.ebuild,v 1.3 2006/02/07 09:11:22 twp Exp $
 
 inherit eutils
 
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xmessage
 			x11-proto/xproto
 			x11-proto/xextproto
-			xinerama? ( x11-proto/xinermaproto )
+			xinerama? ( x11-proto/xineramaproto )
 		)
 		virtual/x11
 	)
diff --git a/x11-wm/ion2/ion2-20040729.ebuild b/x11-wm/ion2/ion2-20040729.ebuild
deleted file mode 100644
index 786e8cedc00d..000000000000
--- a/x11-wm/ion2/ion2-20040729.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ion2-20040729.ebuild,v 1.8 2005/09/17 10:24:18 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="A tiling tabbed window manager designed with keyboard users in mind"
-HOMEPAGE="http://www.iki.fi/tuomov/ion/"
-SRC_URI="http://modeemi.fi/~tuomov/ion/dl/ion-2-${PV}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
-IUSE="xinerama"
-DEPEND="virtual/x11
-	app-misc/run-mailcap
-	>=dev-lang/lua-5.0.2
-	>=sys-devel/libtool-1.4.3
-	!<=x11-wm/ion2-20040211-r2"
-S=${WORKDIR}/ion-2-${PV}
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-
-	epatch ${FILESDIR}/ion2-20040601-rename.patch
-
-}
-
-src_compile() {
-
-	local myconf=""
-
-	if has_version '>=x11-base/xfree-4.3.0'; then
-		myconf="${myconf} --disable-xfree86-textprop-bug-workaround"
-	fi
-
-	autoreconf
-
-	use hppa && myconf="${myconf} --disable-shared"
-
-	econf \
-		--sysconfdir=/etc/X11 \
-		`use_enable xinerama` \
-		${myconf} || die
-
-	emake \
-		DOCDIR=/usr/share/doc/${PF} || die
-
-}
-
-src_install() {
-
-	make \
-		MODULEDIR=${D}/usr/$(get_libdir)/ion2 \
-		LCDIR=${D}/usr/$(get_libdir)/ion2/lc \
-		prefix=${D}/usr \
-		ETCDIR=${D}/etc/X11/ion2 \
-		SHAREDIR=${D}/usr/share/ion2 \
-		MANDIR=${D}/usr/share/man \
-		DOCDIR=${D}/usr/share/doc/${PF} \
-		install || die
-
-	mv ${D}/usr/bin/ion ${D}/usr/bin/ion2
-	mv ${D}/usr/bin/pwm ${D}/usr/bin/pwm2
-	mv ${D}/usr/share/man/man1/ion.1 ${D}/usr/share/man/man1/ion2.1
-	mv ${D}/usr/share/man/man1/pwm.1 ${D}/usr/share/man/man1/pwm2.1
-
-	prepalldocs
-
-	insinto /usr/include/ion2
-	doins *.h *.mk mkexports.lua
-	for i in de floatws ioncore ionws luaextl menu query; do
-		insinto /usr/include/ion2/${i}
-		doins ${i}/*.h
-	done
-	insinto /usr/include/ion2/libtu
-	doins libtu/*.h
-
-	echo -e "#!/bin/sh\n/usr/bin/ion2" > ${T}/ion2
-	echo -e "#!/bin/sh\n/usr/bin/pwm2" > ${T}/pwm2
-	exeinto /etc/X11/Sessions
-	doexe ${T}/ion2 ${T}/pwm2
-
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/ion2.desktop ${FILESDIR}/pwm2.desktop
-
-}