Ported AfterStep to modular X.

(Portage version: 2.1_pre4-r1)

6 files changed, 77 insertions, 82 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index 1db4ed27a3ff..760fc331b6a6 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/afterstep
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.50 2006/02/09 11:52:30 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.51 2006/02/13 21:14:38 spock Exp $
+
+  13 Feb 2006; Michał Januszewski <spock@gentoo.org>
+  -afterstep-1.8.11-r2.ebuild, afterstep-2.00.05.ebuild,
+  afterstep-2.1.2.ebuild, afterstep-2.2.0.ebuild:
+  Ported AfterStep to modular X. Removed an old ebuild.
 
   09 Feb 2006; Guy Martin <gmsoft@gentoo.org> afterstep-2.2.0.ebuild:
   Works perfectly on hppa.
diff --git a/x11-wm/afterstep/afterstep-1.8.11-r2.ebuild b/x11-wm/afterstep/afterstep-1.8.11-r2.ebuild
deleted file mode 100644
index 5894a288964f..000000000000
--- a/x11-wm/afterstep/afterstep-1.8.11-r2.ebuild
+++ /dev/null
@@ -1,66 +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/afterstep/afterstep-1.8.11-r2.ebuild,v 1.23 2005/08/23 18:55:31 ka0ttic Exp $
-
-S=${WORKDIR}/AfterStep-${PV}
-DESCRIPTION="A window manager based on the NeXTStep interface."
-SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
-HOMEPAGE="http://www.afterstep.org/"
-LICENSE="AFTERSTEP"
-SLOT="0"
-KEYWORDS="x86 sparc ppc ~mips"
-IUSE="nls"
-
-DEPEND="virtual/libc virtual/x11
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.1"
-## >=media-libs/xpm-3.4k
-
-RDEPEND="${DEPEND}
-	 >=media-sound/sox-12.17.1"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	local myconf
-	use nls && myconf="${myconf} --enable-i18n"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc/X11 \
-		--with-helpcommand="xterm -e man" \
-		--disable-availability \
-		--disable-staticlibs \
-		--with-xpm \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} \
-	     GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \
-	     install || die
-
-	rm -f ${D}/usr/bin/sessreg
-
-	dodoc COPYRIGHT ChangeLog INSTALL NEW README* TEAM UPGRADE
-	cp -pPR ${S}/TODO ${D}/usr/share/doc/${PF}/
-	dodir /usr/share/doc/${PF}/html
-	cp -pPR ${S}/doc/* ${D}/usr/share/doc/${PF}/html
-	rm ${D}/usr/share/doc/${PF}/html/Makefile*
-
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/afterstep
-
-}
diff --git a/x11-wm/afterstep/afterstep-2.00.05.ebuild b/x11-wm/afterstep/afterstep-2.00.05.ebuild
index c65524d5f179..fe1c7c168739 100644
--- a/x11-wm/afterstep/afterstep-2.00.05.ebuild
+++ b/x11-wm/afterstep/afterstep-2.00.05.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/x11-wm/afterstep/afterstep-2.00.05.ebuild,v 1.6 2005/08/23 18:55:31 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.00.05.ebuild,v 1.7 2006/02/13 21:14:38 spock Exp $
 
 inherit flag-o-matic
 
@@ -13,14 +13,33 @@ SLOT="0"
 KEYWORDS="ppc sparc x86"
 IUSE="debug gif jpeg mmx nls png tiff xinerama"
 
-DEPEND="virtual/libc
-	virtual/x11
+RDEPEND="virtual/libc
 	media-libs/freetype
 	debug? ( !ppc? ( dev-util/efence ) )
 	png? ( >=media-libs/libpng-1.2.5 )
 	jpeg? ( >=media-libs/jpeg-6b )
 	gif?  ( >=media-libs/giflib-4.1.0 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	|| ( ( x11-libs/libICE
+			x11-libs/libXext
+			x11-libs/libSM
+			x11-libs/libXmu
+			x11-libs/libXt
+			x11-libs/libX11
+			x11-libs/libXpm
+			x11-libs/libXrender
+			xinerama? ( x11-libs/libXinerama )
+		)
+		virtual/x11
+	)"
+
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+			x11-proto/xproto
+			xinerama? ( x11-proto/xineramaproto )
+		)
+		virtual/x11
+	)"
 
 S="${WORKDIR}/AfterStep-${PV}"
 
diff --git a/x11-wm/afterstep/afterstep-2.1.2.ebuild b/x11-wm/afterstep/afterstep-2.1.2.ebuild
index cc5a348990d7..8fe6036a71a6 100644
--- a/x11-wm/afterstep/afterstep-2.1.2.ebuild
+++ b/x11-wm/afterstep/afterstep-2.1.2.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/x11-wm/afterstep/afterstep-2.1.2.ebuild,v 1.6 2005/11/11 23:10:26 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.1.2.ebuild,v 1.7 2006/02/13 21:14:38 spock Exp $
 
 inherit flag-o-matic
 
@@ -13,14 +13,33 @@ SLOT="0"
 KEYWORDS="~amd64 ~mips ppc ~ppc64 sparc x86"
 IUSE="debug gif jpeg mmx nls png tiff xinerama"
 
-DEPEND="virtual/libc
-	virtual/x11
+RDEPEND="virtual/libc
 	media-libs/freetype
 	debug? ( !ppc? ( dev-util/efence ) )
 	png? ( >=media-libs/libpng-1.2.5 )
 	jpeg? ( >=media-libs/jpeg-6b )
 	gif?  ( >=media-libs/giflib-4.1.0 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	|| ( ( x11-libs/libICE
+			x11-libs/libXext
+			x11-libs/libSM
+			x11-libs/libXmu
+			x11-libs/libXt
+			x11-libs/libX11
+			x11-libs/libXpm
+			x11-libs/libXrender
+			xinerama? ( x11-libs/libXinerama )
+		)
+		virtual/x11
+	)"
+
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+			x11-proto/xproto
+			xinerama? ( x11-proto/xineramaproto )
+		)
+		virtual/x11
+	)"
 
 S="${WORKDIR}/AfterStep-${PV}"
 
diff --git a/x11-wm/afterstep/afterstep-2.2.0.ebuild b/x11-wm/afterstep/afterstep-2.2.0.ebuild
index 3a2510f18e59..a55248e2d00d 100644
--- a/x11-wm/afterstep/afterstep-2.2.0.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.0.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/afterstep/afterstep-2.2.0.ebuild,v 1.2 2006/02/09 11:52:30 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.0.ebuild,v 1.3 2006/02/13 21:14:38 spock Exp $
 
 inherit flag-o-matic
 
@@ -13,14 +13,33 @@ SLOT="0"
 KEYWORDS="~amd64 hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug gif jpeg mmx nls png tiff xinerama"
 
-DEPEND="virtual/libc
-	virtual/x11
+RDEPEND="virtual/libc
 	media-libs/freetype
 	debug? ( !hppa? ( !ppc? ( dev-util/efence ) ) )
 	png? ( >=media-libs/libpng-1.2.5 )
 	jpeg? ( >=media-libs/jpeg-6b )
 	gif?  ( >=media-libs/giflib-4.1.0 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	|| ( ( x11-libs/libICE
+			x11-libs/libXext
+			x11-libs/libSM
+			x11-libs/libXmu
+			x11-libs/libXt
+			x11-libs/libX11
+			x11-libs/libXpm
+			x11-libs/libXrender
+			xinerama? ( x11-libs/libXinerama )
+		)
+		virtual/x11
+	)"
+
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+			x11-proto/xproto
+			xinerama? ( x11-proto/xineramaproto )
+		)
+		virtual/x11
+	)"
 
 S="${WORKDIR}/AfterStep-${PV}"
 
diff --git a/x11-wm/afterstep/files/digest-afterstep-1.8.11-r2 b/x11-wm/afterstep/files/digest-afterstep-1.8.11-r2
deleted file mode 100644
index 4bbf31502daa..000000000000
--- a/x11-wm/afterstep/files/digest-afterstep-1.8.11-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d8b41b7a642105b4cafc4d3d5f12a46 AfterStep-1.8.11.tar.bz2 1162212