version bump/fix for #11465

7 files changed, 20 insertions, 108 deletions

diff --git a/app-emulation/XWine/ChangeLog b/app-emulation/XWine/ChangeLog
index db7fe3d056f7..8f02488a6dae 100644
--- a/app-emulation/XWine/ChangeLog
+++ b/app-emulation/XWine/ChangeLog
@@ -1,17 +1,20 @@
 # ChangeLog for app-emulation/XWine
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/XWine/ChangeLog,v 1.7 2003/03/13 11:57:55 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/XWine/ChangeLog,v 1.8 2003/06/20 04:30:41 vapier Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+*XWine-0.3.1 (20 Jun 2003)
+
+  20 Jun 3003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumped + cleaned up for #11465.
  
-*XWine-0.3.ebuild (13 Mar 2002)
+*XWine-0.3 (13 Mar 2002)
 
   13 Mar 2003; phoen][x <phoenix@gentoo.org> XWine-0.3.ebuild, files/digest-XWine-0.3 :
   Version bump. This ebuild fixes problems with the interactive configure
   and ends the gnome dependency trouble: XWine depends on gnome, there's no
   way to compile it without gnome-libs being installed.
 
-*XWine-0.2.2.ebuild (17 Aug 2002)
+*XWine-0.2.2 (17 Aug 2002)
 
   13 Mar 2003; phoen][x <phoenix@gentoo.org> XWine-0.2.2.ebuild :
   Incorporated latest bugfixes (bug #11465) into this ebuild.
diff --git a/app-emulation/XWine/Manifest b/app-emulation/XWine/Manifest
index b43c3a4d20b9..3a3c05430aff 100644
--- a/app-emulation/XWine/Manifest
+++ b/app-emulation/XWine/Manifest
@@ -1,5 +1,3 @@
-MD5 5ce58d6b26e085e7fb36560432a4efb2 ChangeLog 1366
-MD5 6af1c0fafb6d82dff8b69ef82c4cd02b XWine-0.2.2.ebuild 1624
-MD5 1d4b5efd7790f6d7965fa2d6e1179ed8 XWine-0.3.ebuild 1617
-MD5 64fb5b2e1a244d661d62a04a5e2c6884 files/digest-XWine-0.2.2 66
-MD5 8aa222e2b09b9e9f4b85f70e89f3f698 files/digest-XWine-0.3 64
+MD5 4837a922513d4f243f19eb64789f2556 files/digest-XWine-0.3.1 66
+MD5 ff9a2dcd35e63b22c0994ea9e43383ba XWine-0.3.1.ebuild 1099
+MD5 5826f0339076ffbcfeb2c4054cafdd13 ChangeLog 1394
diff --git a/app-emulation/XWine/XWine-0.2.2.ebuild b/app-emulation/XWine/XWine-0.2.2.ebuild
deleted file mode 100644
index 335585c1d103..000000000000
--- a/app-emulation/XWine/XWine-0.2.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/XWine/XWine-0.2.2.ebuild,v 1.7 2003/03/13 11:57:55 phoenix Exp $
-
-DESCRIPTION="GTK frontend for Wine"
-HOMEPAGE="http://darken.tuxfamily.org/pages/xwine_en.html"
-SRC_URI="http://darken.tuxfamily.org/projets/${P}_en.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc "
-IUSE="nls gnome"
-
-DEPEND=">=x11-libs/gtk+-1.2.10-r8
-	>=net-www/mozilla-1.0-r2
-	>=app-emulation/wine-20020710-r1
-	sys-devel/bison
-	>=gnome-base/gnome-libs-1.4.2 
-	>=gnome-base/ORBit-0.5.17
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}
-	>=app-emulation/winesetuptk-0.6.0b-r2"
-
-S="${WORKDIR}/${P}_en"
-
-src_compile() {
-	local myconf
-
-	use nls && myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
-
-	MOZ="`which mozilla`"
-
-	if [ -f ${MOZ} ] ; then
-		einfo "Setting up src/donnees.h to use mozilla as help browser."
-		cp -f ${S}/configure.d ${S}/configure
-		cp -f ${S}/src/donnees.h.in ${S}/src/donnees.h
-		echo "#define NAVIGATEUR \"${MOZ} -f\"" >> ${S}/src/donnees.h
-	else
-		ewarn "Mozilla not found in current PATH."
-		ewarn "PATH = ${PATH}"
-		die "Mozilla not found."
-	fi
-
-
-	econf ${myconf}
-
-	emake || die
-}
-
-src_install() {
-	einstall
-
-	# Don't need to install docs twice
-	rm -rf ${D}/usr/share/doc/xwine
-
-	dodoc doc/Manual* FAQ* BUGS COPYING AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
-	einfo "${PN} requires a setup Wine to start....It is recommended"
-	einfo "that you run winesetuptk prior to running ${PN} to setup"
-	einfo "a base Wine install"
-}
diff --git a/app-emulation/XWine/XWine-0.3.ebuild b/app-emulation/XWine/XWine-0.3.1.ebuild
index ba867e24c3df..90e342869360 100644
--- a/app-emulation/XWine/XWine-0.3.ebuild
+++ b/app-emulation/XWine/XWine-0.3.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/XWine/XWine-0.3.ebuild,v 1.1 2003/03/13 11:52:37 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/XWine/XWine-0.3.1.ebuild,v 1.1 2003/06/20 04:30:41 vapier Exp $
 
-DESCRIPTION="GTK frontend for Wine"
+DESCRIPTION="GTK+ frontend for Wine"
 HOMEPAGE="http://darken.tuxfamily.org/pages/xwine_en.html"
 SRC_URI="http://darken.tuxfamily.org/projets/${P}_en.tar.gz"
 
@@ -11,49 +11,23 @@ SLOT="0"
 KEYWORDS="~x86 -ppc -sparc "
 IUSE="nls"
 
-DEPEND=">=x11-libs/gtk+-1.2.10-r8
-	>=net-www/mozilla-1.0-r2
-	>=app-emulation/wine-20020710-r1
+DEPEND="=x11-libs/gtk+-1*
 	sys-devel/bison
-	>=gnome-base/gnome-libs-1.4.2 
+	>=gnome-base/gnome-libs-1.4.2
 	>=gnome-base/ORBit-0.5.17
 	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}
-	>=app-emulation/winesetuptk-0.6.0b-r2"
 
-S="${WORKDIR}/${P}_en"
+S=${WORKDIR}/${P}_en
 
 src_compile() {
-	local myconf
-
-	use nls && myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
-
-
-	MOZ="`which mozilla`"
-
-	if [ -f ${MOZ} ] ; then
-		einfo "Setting up src/donnees.h to use mozilla as help browser."
-		cp -f ${S}/configure.d ${S}/configure
-		cp -f ${S}/src/donnees.h.in ${S}/src/donnees.h
-		echo "#define NAVIGATEUR \"${MOZ} -f\"" >> ${S}/src/donnees.h
-	else
-		ewarn "Mozilla not found in current PATH."
-		ewarn "PATH = ${PATH}"
-		die "Mozilla not found."
-	fi
-
-	econf ${myconf}
-
+	econf `use_enable nls` || die
 	emake || die
 }
 
 src_install() {
-	einstall
-
+	einstall || die
 	# Don't need to install docs twice
 	rm -rf ${D}/usr/share/doc/xwine
-
 	dodoc doc/Manual* FAQ* BUGS COPYING AUTHORS ChangeLog NEWS README TODO
 }
 
@@ -61,4 +35,6 @@ pkg_postinst() {
 	einfo "${PN} requires a setup Wine to start....It is recommended"
 	einfo "that you run winesetuptk prior to running ${PN} to setup"
 	einfo "a base Wine install"
+	einfo ""
+	einfo "You should also emerge wine or winex at this point"
 }
diff --git a/app-emulation/XWine/files/digest-XWine-0.2.2 b/app-emulation/XWine/files/digest-XWine-0.2.2
deleted file mode 100644
index c12eb9a69803..000000000000
--- a/app-emulation/XWine/files/digest-XWine-0.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a14e537d63657cd7f242f17b085abbe XWine-0.2.2_en.tar.gz 303962
diff --git a/app-emulation/XWine/files/digest-XWine-0.3 b/app-emulation/XWine/files/digest-XWine-0.3
deleted file mode 100644
index ee22c386876f..000000000000
--- a/app-emulation/XWine/files/digest-XWine-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e7b31440f95ff06e2ab4f0893d48bef4 XWine-0.3_en.tar.gz 347894
diff --git a/app-emulation/XWine/files/digest-XWine-0.3.1 b/app-emulation/XWine/files/digest-XWine-0.3.1
new file mode 100644
index 000000000000..201120b72476
--- /dev/null
+++ b/app-emulation/XWine/files/digest-XWine-0.3.1
@@ -0,0 +1 @@
+MD5 dda3f5ebbcc0a200243713b247079794 XWine-0.3.1_en.tar.gz 736177