New ebuild naming convention. Incorporated new features of cvs.eclass

8 files changed, 175 insertions, 19 deletions

diff --git a/app-emulation/winex-cvs/ChangeLog b/app-emulation/winex-cvs/ChangeLog
index bd50d95a71ed..6a7265b0bd63 100644
--- a/app-emulation/winex-cvs/ChangeLog
+++ b/app-emulation/winex-cvs/ChangeLog
@@ -1,8 +1,34 @@
 # ChangeLog for app-emulation/winex-cvs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex-cvs/ChangeLog,v 1.1 2002/09/01 06:25:28 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex-cvs/ChangeLog,v 1.2 2002/09/08 20:09:35 phoenix Exp $
 
-*winex-20020831 (01 September 2002)
+
+*winex-cvs-2.1 (08 September 20002)
+  08 Sep 2002; phoen][x <phoenix@gentoo.org> winex-cvs-2.1.ebuild,
+  files/digest-winex-cvs-2.1, files/winex-cvs-fake_windows.tar.bz2,
+  files/winex-cvs-regedit, files/winex-cvs-winex :
+
+  This is the new winex-2.1 CVS ebuild. Implemented Dan Armaks new ECVS_BRANCH setting. 
+  Thanks Dan. I overwrote the ECVS_TOP_DIR to be able to have multiple versions of
+  a local cvs tree on the users harddrive - each branch has its own tree. That should
+  speed things up if you often switch between branches; If you dont switch it won't
+  waste HD space because you didn't fetch different branches in the first place. :)
+
+*winex-cvs-2.0 (08 September 20002)
+  08 Sep 2002; phoen][x <phoenix@gentoo.org> winex-cvs-2.0.ebuild,
+  files/digest-winex-cvs-2.0, files/winex-cvs-fake_windows.tar.bz2,
+  files/winex-cvs-regedit, files/winex-cvs-winex :
+
+  This ebuild is identical to the winex-cvs-2.1 ebuild. The name of the ebuild 
+  tells portage to fetch the winex-2.0 branch instead. (A simple symlink would
+  have done the trick, yes)
+
+*winex-cvs-20020831 (01 September 2002)
+
+  08 Sep 2002; phoen][x <phoenix@gentoo.org> winex-cvs-20020831.ebuild :
+  
+  This ebuild is now obsolete. The name puzzled quite a few users.
+  There should be no problems with the new naming convention.
 
   01 Sep 2002; phoen][x <phoenix@gentoo.org> ChangeLog, winex-cvs-20020831.ebuild,
   files/winex-cvs-20020831-fake_windows.tar.bz2, files/winex-cvs-20020831-regedit,
@@ -12,4 +38,3 @@
   (the normal one and the cvs one) installed at the same time, i made this one go
   into /usr/lib/winex-cvs. The wrapper is called /usr/bin/winex-cvs and the 
   regedit is named /usr/bin/regedit-winex-cvs.
-
diff --git a/app-emulation/winex-cvs/files/digest-winex-cvs-20020831 b/app-emulation/winex-cvs/files/digest-winex-cvs-2.0
index e69de29bb2d1..e69de29bb2d1 100644
--- a/app-emulation/winex-cvs/files/digest-winex-cvs-20020831
+++ b/app-emulation/winex-cvs/files/digest-winex-cvs-2.0
diff --git a/app-emulation/winex-cvs/files/digest-winex-cvs-2.1 b/app-emulation/winex-cvs/files/digest-winex-cvs-2.1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-emulation/winex-cvs/files/digest-winex-cvs-2.1
diff --git a/app-emulation/winex-cvs/files/winex-cvs-20020831-fake_windows.tar.bz2 b/app-emulation/winex-cvs/files/winex-cvs-fake_windows.tar.bz2
index d60f11e08ee3..d60f11e08ee3 100644
--- a/app-emulation/winex-cvs/files/winex-cvs-20020831-fake_windows.tar.bz2
+++ b/app-emulation/winex-cvs/files/winex-cvs-fake_windows.tar.bz2
diff --git a/app-emulation/winex-cvs/files/winex-cvs-20020831-regedit b/app-emulation/winex-cvs/files/winex-cvs-regedit
index 38986bfada06..38986bfada06 100644
--- a/app-emulation/winex-cvs/files/winex-cvs-20020831-regedit
+++ b/app-emulation/winex-cvs/files/winex-cvs-regedit
diff --git a/app-emulation/winex-cvs/files/winex-cvs-20020831-winex b/app-emulation/winex-cvs/files/winex-cvs-winex
index 1fd1a609d0d5..1fd1a609d0d5 100644
--- a/app-emulation/winex-cvs/files/winex-cvs-20020831-winex
+++ b/app-emulation/winex-cvs/files/winex-cvs-winex
diff --git a/app-emulation/winex-cvs/winex-cvs-20020831.ebuild b/app-emulation/winex-cvs/winex-cvs-2.0.ebuild
index a60c4ebdd71e..21872d252673 100644
--- a/app-emulation/winex-cvs/winex-cvs-20020831.ebuild
+++ b/app-emulation/winex-cvs/winex-cvs-2.0.ebuild
@@ -1,17 +1,23 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex-cvs/winex-cvs-20020831.ebuild,v 1.1 2002/09/01 06:25:28 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex-cvs/winex-cvs-2.0.ebuild,v 1.1 2002/09/08 20:09:35 phoenix Exp $
+
+# Dont modify the ECVS_BRANCH setting yourself.
+# Instead, make a backup of this ebuild and rename it to
+# winex-[your branch].ebuild. 
+#
+# Example:
+#   winex-kohan-2.1.ebuild
+#
+# You can find more branches on 
+# http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/winex/wine/
 
-# Modify this if you want some other branch. Possible values are:
-#  winex-2-1
-#  winex-2-0
-#  winex
-# You can find more branches on http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/winex/wine/
 
-WINEX_BRANCH="winex-2-1"
 ECVS_SERVER="cvs.winex.sourceforge.net:/cvsroot/winex"
 ECVS_MODULE="wine"
-ECVS_CVS_OPTIONS="-r${WINEX_BRANCH} -dP"
+ECVS_BRANCH=${PN/cvs/}${PV/./-}
+ECVS_TOP_DIR="${DISTDIR}/cvs-src/${ECVS_BRANCH}"
+mkdir -p ${ECVS_TOP_DIR}
 
 inherit cvs
 
@@ -47,11 +53,11 @@ src_compile() {
 	unset CXXFLAGS
 	
 	./configure --prefix=/usr/lib/winex-cvs \
-	--sysconfdir=/etc/winex-cvs \
-	--host=${CHOST} \
-	--enable-curses \
-	--with-x \
-	${myconf} || die "configure failed"
+		--sysconfdir=/etc/winex-cvs \
+		--host=${CHOST} \
+		--enable-curses \
+		--with-x \
+		${myconf} || die "configure failed"
 
 	# Fixes a winetest issue
 	cd ${S}/programs/winetest
@@ -82,7 +88,7 @@ src_install () {
 	# This is needed for our new winex-cvs wrapper script
 	mkdir ${D}/usr/lib/winex-cvs/.data
 	pushd ${D}/usr/lib/winex-cvs/.data
-	tar jxvf ${FILESDIR}/${P}-fake_windows.tar.bz2 
+	tar jxvf ${FILESDIR}/${PN}-fake_windows.tar.bz2 
 	popd
 	cp ${S}/documentation/samples/config ${S}/documentation/samples/config.orig
 	sed -e 's/"Path" = "\/c"/"Path" = "\$\{HOME\}\/.winex-cvs\/fake_windows"/' \
@@ -91,8 +97,8 @@ src_install () {
 	cp ${WORKDIR}/wine/winedefault.reg ${D}/usr/lib/winex-cvs/.data/winedefault.reg
 	# Install the wrapper script
 	mkdir ${D}/usr/bin
-	cp ${FILESDIR}/${P}-winex ${D}/usr/bin/winex-cvs
-	cp ${FILESDIR}/${P}-regedit ${D}/usr/bin/regedit-winex-cvs
+	cp ${FILESDIR}/${PN}-winex ${D}/usr/bin/winex-cvs
+	cp ${FILESDIR}/${PN}-regedit ${D}/usr/bin/regedit-winex-cvs
 
 	# Take care of the other stuff
 	cd ${S}
diff --git a/app-emulation/winex-cvs/winex-cvs-2.1.ebuild b/app-emulation/winex-cvs/winex-cvs-2.1.ebuild
new file mode 100644
index 000000000000..f5a2422a68c2
--- /dev/null
+++ b/app-emulation/winex-cvs/winex-cvs-2.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winex-cvs/winex-cvs-2.1.ebuild,v 1.1 2002/09/08 20:09:35 phoenix Exp $
+
+# Dont modify the ECVS_BRANCH setting yourself.
+# Instead, make a backup of this ebuild and rename it to
+# winex-[your branch].ebuild. 
+#
+# Example:
+#   winex-kohan-2.1.ebuild
+#
+# You can find more branches on 
+# http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/winex/wine/
+
+
+ECVS_SERVER="cvs.winex.sourceforge.net:/cvsroot/winex"
+ECVS_MODULE="wine"
+ECVS_BRANCH=${PN/cvs/}${PV/./-}
+ECVS_TOP_DIR="${DISTDIR}/cvs-src/${ECVS_BRANCH}"
+mkdir -p ${ECVS_TOP_DIR}
+
+inherit cvs
+
+S=${WORKDIR}/${ECVS_MODULE}
+DESCRIPTION="WineX is a distribution of Wine with enhanced DirectX for gaming.
+	     This ebuild will fetch the newest cvs sources from the cvs-server."
+HOMEPAGE="http://www.transgaming.com/"
+
+SLOT="0"
+KEYWORDS="x86 -ppc"
+LICENSE="Aladdin"
+
+DEPEND="virtual/x11
+	sys-devel/gcc
+	sys-devel/flex
+	dev-util/yacc
+	>=media-libs/freetype-2.0.0
+	dev-lang/tcl dev-lang/tk
+	opengl? ( virtual/opengl )
+	cups? ( net-print/cups )"
+
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	cd ${S}
+	local myconf
+
+	use opengl && myconf="--enable-opengl" || myconf="--disable-opengl"
+	[ -z $DEBUG ] && myconf="$myconf --disable-trace --disable-debug" || myconf="$myconf --enable-trace --enable-debug"
+
+	# the folks at #winehq were really angry about custom optimization
+	unset CFLAGS
+	unset CXXFLAGS
+	
+	./configure --prefix=/usr/lib/winex-cvs \
+		--sysconfdir=/etc/winex-cvs \
+		--host=${CHOST} \
+		--enable-curses \
+		--with-x \
+		${myconf} || die "configure failed"
+
+	# Fixes a winetest issue
+	cd ${S}/programs/winetest
+	cp Makefile 1
+	sed -e 's:wine.pm:include/wine.pm:' 1 > Makefile
+
+	# This persuades wineshelllink that "winex-cvs" is a better loader :)
+	cd ${S}/tools
+	cp wineshelllink 1
+	sed -e 's/\(WINE_LOADER=\)\(\${WINE_LOADER:-wine}\)/\1winex-cvs/' 1 > wineshelllink
+
+	cd ${S}	
+	make depend all || die "make depend all failed"
+	cd programs && emake || die "emake died"
+}
+
+src_install () {
+	local WINEXMAKEOPTS="prefix=${D}/usr/lib/winex-cvs"
+	
+	# Installs winex to /usr/lib/winex-cvs
+	cd ${S}
+	make ${WINEXMAKEOPTS} install || die "make install failed"
+	cd ${S}/programs
+	make ${WINEXMAKEOPTS} install || die "make install failed"
+	
+
+	# Creates /usr/lib/winex-cvs/.data with fake_windows in it
+	# This is needed for our new winex-cvs wrapper script
+	mkdir ${D}/usr/lib/winex-cvs/.data
+	pushd ${D}/usr/lib/winex-cvs/.data
+	tar jxvf ${FILESDIR}/${PN}-fake_windows.tar.bz2 
+	popd
+	cp ${S}/documentation/samples/config ${S}/documentation/samples/config.orig
+	sed -e 's/"Path" = "\/c"/"Path" = "\$\{HOME\}\/.winex-cvs\/fake_windows"/' \
+	    ${S}/documentation/samples/config.orig > ${S}/documentation/samples/config
+	cp ${S}/documentation/samples/config ${D}/usr/lib/winex-cvs/.data/config
+	cp ${WORKDIR}/wine/winedefault.reg ${D}/usr/lib/winex-cvs/.data/winedefault.reg
+	# Install the wrapper script
+	mkdir ${D}/usr/bin
+	cp ${FILESDIR}/${PN}-winex ${D}/usr/bin/winex-cvs
+	cp ${FILESDIR}/${PN}-regedit ${D}/usr/bin/regedit-winex-cvs
+
+	# Take care of the other stuff
+	cd ${S}
+	dodoc ANNOUNCE AUTHORS BUGS ChangeLog DEVELOPERS-HINTS LICENSE README
+
+	insinto /usr/lib/winex-cvs/.data/fake_windows/Windows
+	doins documentation/samples/system.ini
+	doins documentation/samples/generic.ppd
+	
+	# Remove the executable flag from those libraries.
+	cd ${D}/usr/lib/winex-cvs/bin
+	chmod a-x *.so
+		
+}
+
+pkg_postinst() {
+	einfo "**********************************************************************"
+	einfo "* NOTE: Use /usr/bin/winex-cvs to start winex.                       *"
+	einfo "*       This is a wrapper-script which will take care of everything  *"
+	einfo "*       else. If you have further questions, enhancements or patches *"
+	einfo "*       send an email to phoenix@gentoo.org                          *"
+	einfo "**********************************************************************"
+}
+