Removed vnc flag, removed old ebuild.

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

4 files changed, 17 insertions, 142 deletions

diff --git a/app-emulation/mol/ChangeLog b/app-emulation/mol/ChangeLog
index 5a092b57f215..c3fa9eccb2a3 100644
--- a/app-emulation/mol/ChangeLog
+++ b/app-emulation/mol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/mol
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.79 2008/07/28 18:54:35 cardoe Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.80 2010/02/12 18:56:52 josejx Exp $
+
+  12 Feb 2010; Joseph Jezak <josejx@gentoo.org> -mol-0.9.72.ebuild,
+  mol-0.9.72.1.ebuild:
+  Removed vnc flag, removed old ebuild.
 
   28 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-emulation/mol/Manifest b/app-emulation/mol/Manifest
index 13e28464a30e..0f3d30a8fd2c 100644
--- a/app-emulation/mol/Manifest
+++ b/app-emulation/mol/Manifest
@@ -2,15 +2,13 @@
 Hash: SHA1
 
 DIST mol-0.9.72.1.tar.bz2 1818637 RMD160 0f6b8f424641c68fa23a54f695eb3c6aec991615 SHA1 a608d9b542e73c574b2b11ba32688106673ec801 SHA256 05a8fe9ec1bf4f275b173868702fc52f5715b4206f9152e5835c18c6f75d394d
-DIST mol-0.9.72.tar.bz2 1867036 RMD160 90af6485db12395f689f5e403752099d352d61ae SHA1 bea1925be1f889ee59a1a975eb3645899819ad88 SHA256 470bb5e56590c9312290a57689f73d1237c928f731fb7b668e5d01f9459f0a1f
-EBUILD mol-0.9.72.1.ebuild 4286 RMD160 ab32a1e5229fc72a99bd11f09949783e53f34dd6 SHA1 739b9c8a40d7cfee8f33503818bb15b244ca0dcb SHA256 de01bb0874169a98e408e66bc599ed0400c51e7203527cdca7121339b02a5351
-EBUILD mol-0.9.72.ebuild 4283 RMD160 89e34153c8143c979542a9db4003b6e3d4f7ee0d SHA1 32031e64de5188f5618232197f25f9e90582c395 SHA256 30c768984379e8d44c6a6f63450c0e1451dceab32cf63c62590c91b3ce10599f
-MISC ChangeLog 15426 RMD160 bcba09c0926ebb8e659f428fb5c201728d96d160 SHA1 c50e43b703684ebc56e67705ac576d70e1b25229 SHA256 87a942b3d335eb32e512e67db26fd099c8e2fa089b387441fcc98f7909c04ee3
+EBUILD mol-0.9.72.1.ebuild 4295 RMD160 ee3205adc95d43ebae59a221c86f149fee06d15d SHA1 0ac8e5949680a38318af0982514330afe4e32eb5 SHA256 282b10b7a3148b62c354778a6304bb188ff490b27f4829df139c692959e51768
+MISC ChangeLog 15558 RMD160 3969588c7538f093a529438f35933c04aa712fef SHA1 815dcab1148690b89a1128e929763d4aefbdff0e SHA256 ab3d1b8a325d2c371037292e6272ea6494c0fe1a43b6b71a45985f776417faca
 MISC metadata.xml 563 RMD160 862f25f48e00777cc071bcbd3e1536b676dd1837 SHA1 ffc430e7ed30ec4d7d4a94c87e0a426b6e4903b5 SHA256 7e42fd7ab37949dd4bd6a3920d576e4ef8bda54a7d4aab442813d14af6b2c372
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkiOFfAACgkQoeSe8B0zEfyIiwCfVMmBbkaW7jL0Vht/YsEifrTN
-JpkAn1d2z1YE69IWfT2hrSfunIYYBR86
-=E+H0
+iEYEARECAAYFAkt1pEMACgkQcsIHjyDViGRUkgCfRmbvRnnXJxh4EDHEazrV8K3b
+lMQAn3ew5dy5XQjuGFYs5QaN/Q+UGtSf
+=NCbw
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/mol/mol-0.9.72.1.ebuild b/app-emulation/mol/mol-0.9.72.1.ebuild
index 3aa8be0c2509..b4c8a703fb6b 100644
--- a/app-emulation/mol/mol-0.9.72.1.ebuild
+++ b/app-emulation/mol/mol-0.9.72.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.72.1.ebuild,v 1.3 2008/03/23 21:30:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.72.1.ebuild,v 1.4 2010/02/12 18:56:52 josejx Exp $
 
 inherit flag-o-matic eutils linux-mod
 
@@ -11,14 +11,13 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~ppc"
-IUSE="vnc alsa oss fbcon X oldworld sheep debug dga usb pci"
+IUSE="alsa oss fbcon X oldworld sheep debug dga usb pci"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 RDEPEND="net-misc/dhcp
 	sys-libs/zlib
 	net-firewall/iptables
 	alsa? ( media-libs/alsa-lib )
-	vnc? ( net-misc/vnc )
 	X? ( x11-libs/libXext
 		dga? ( x11-libs/libXxf86dga ) )"
 DEPEND="${RDEPEND}
@@ -62,7 +61,8 @@ src_compile() {
 	use sheep	 || sed -i "s:iCONFIG_SHEEP=y:# CONFIG_SHEEP is not set:" .config-ppc
 	use X		 || sed -i "s:CONFIG_X11=y:# CONFIG_X11 is not set:" .config-ppc
 	use fbcon	 || sed -i "s:CONFIG_FBDEV=y:# CONFIG_FBDEV is not set:" .config-ppc
-	use vnc		 || sed -i "s:CONFIG_VNC=y:# CONFIG_VNC is not set:" .config-ppc
+	### Remove VNC, since the deps are broken
+				    sed -i "s:CONFIG_VNC=y:# CONFIG_VNC is not set:" .config-ppc
 	use dga		 || sed -i "s:CONFIG_XDGA=y:# CONFIG_XDGA is not set:" .config-ppc
 	use usb		 || sed -i "s:CONFIG_USBDEV=y:# CONFIG_USBDEV is not set:" .config-ppc
 	use pci		 || sed -i "s:CONFIG_PCIPROXY=y:# CONFIG_PCIPROXY is not set:" .config-ppc
diff --git a/app-emulation/mol/mol-0.9.72.ebuild b/app-emulation/mol/mol-0.9.72.ebuild
deleted file mode 100644
index babe48c94065..000000000000
--- a/app-emulation/mol/mol-0.9.72.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.72.ebuild,v 1.4 2008/03/23 21:30:01 robbat2 Exp $
-
-inherit flag-o-matic eutils linux-mod
-
-DESCRIPTION="Mac-on-Linux (MOL) allows PPC users run MacOS(X) under Linux"
-HOMEPAGE="http://www.maconlinux.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc"
-IUSE="vnc alsa oss fbcon X oldworld sheep debug dga usb pci"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-RDEPEND="net-misc/dhcp
-	sys-libs/zlib
-	net-firewall/iptables
-	alsa? ( media-libs/alsa-lib )
-	vnc? ( net-misc/vnc )
-	X? ( x11-libs/libXext
-		dga? ( x11-libs/libXxf86dga ) )"
-DEPEND="${RDEPEND}
-	X? ( x11-libs/libXt
-		x11-proto/xextproto
-		dga? ( x11-proto/xf86dgaproto ) )"
-
-MODULE_NAMES="mol(mol:${S}/src/kmod/Linux)
-			  sheep(net:${S}/src/netdriver)"
-
-pkg_setup() {
-	echo
-	if ! use fbcon; then
-		elog "If you want to use MOL fullscreen on a virtual console"
-		elog "be sure to have the USE-flag \"fbcon\" set!"
-	fi
-	echo
-
-	linux-mod_pkg_setup
-}
-
-src_compile() {
-	filter-flags -fsigned-char
-	replace-flags -O? -O1
-
-	export KERNEL_SOURCE="/usr/src/${FK}"
-	export LDFLAGS=""
-
-	# initialize all needed build-files
-	./autogen.sh
-	./configure --prefix="/usr" || die "Configure failed."
-
-	# workaround for proper module-building
-	emake defconfig || die "Make failed."
-
-	sed -i "s:CONFIG_XDGA=y:# CONFIG_XDGA is not set:" .config-ppc
-	use alsa	 || sed -i "s:CONFIG_ALSA=y:# CONFIG_ALSA is not set:" .config-ppc
-	use debug	 && sed -i "s:# CONFIG_DEBUGGER is not set:CONFIG_DEBUGGER=y:" .config-ppc
-	use oss		 || sed -i "s:CONFIG_OSS=y:# CONFIG_OSS is not set:" .config-ppc
-	use oldworld || sed -i "s:CONFIG_OLDWORLD=y:# CONFIG_OLDWORLD is not set:" .config-ppc
-	use sheep	 || sed -i "s:iCONFIG_SHEEP=y:# CONFIG_SHEEP is not set:" .config-ppc
-	use X		 || sed -i "s:CONFIG_X11=y:# CONFIG_X11 is not set:" .config-ppc
-	use fbcon	 || sed -i "s:CONFIG_FBDEV=y:# CONFIG_FBDEV is not set:" .config-ppc
-	use vnc		 || sed -i "s:CONFIG_VNC=y:# CONFIG_VNC is not set:" .config-ppc
-	use dga		 || sed -i "s:CONFIG_XDGA=y:# CONFIG_XDGA is not set:" .config-ppc
-	use usb		 || sed -i "s:CONFIG_USBDEV=y:# CONFIG_USBDEV is not set:" .config-ppc
-	use pci		 || sed -i "s:CONFIG_PCIPROXY=y:# CONFIG_PCIPROXY is not set:" .config-ppc
-
-	einfo "The configuration has been altered according to your USE-flags."
-	# reinitialize our changed configuration
-	emake oldconfig
-
-	cd "${S}"
-	emake BUILD_MODS=n || die "Build failed."
-
-	# Build the modules too!
-	BUILD_PARAMS="KERNEL_SOURCE=\"${KV_DIR}\" \
-					LV=${KV_MAJOR}${KV_MINOR} \
-					MP=${KV_OBJ} \
-					KUNAME=${KV}"
-	BUILD_TARGETS=all
-	linux-mod_src_compile
-}
-
-src_install() {
-	#linux-mod_src_install
-	cd "${S}"
-	emake DESTDIR="${D}" install || die "Failed to install"
-	dodoc CREDITS Doc/Boot-ROM Doc/NewWorld-ROM Doc/Sound Doc/Video
-	dodoc Doc/Networking Doc/Dev/Debugger Doc/Dev/Addresses
-	dodoc Doc/man/molvconfig.1 Doc/man/startmol.1 Doc/man/molrc.5
-
-	dodir /var/lib/mol/lock
-	touch "${D}"/var/lib/mol/lock/.keep
-	dodir /var/lib/mol/log
-	touch "${D}"/var/lib/mol/log/.keep
-}
-
-pkg_postinst() {
-	echo
-	elog "Mac-on-Linux is now installed.  To run, use the command startmol."
-	if use fbcon; then
-		elog "You might want to configure video modes first with molvconfig."
-	fi
-	elog "Other configuration is in /etc/molrc.	 For more info see:"
-	elog "				http://www.maconlinux.org"
-	elog "Also try man molrc, man molvconfig, man startmol"
-	echo
-	ewarn "For networking and sound you might install the drivers in the"
-	ewarn "folder \"MOL-Install\" on your Mac OS X-Desktop."
-	echo
-	ewarn "If errors with networking occur, make sure you have the following"
-	ewarn "kernel functions enabled:"
-	ewarn "For connecting to Linux:"
-	ewarn "	   Universal TUN/TAP device driver support (CONFIG_TUN)"
-	ewarn "For the dhcp server:"
-	ewarn "	   Packet Socket (CONFIG_PACKET)"
-	ewarn "For NAT:"
-	ewarn "	   Network packet filtering (CONFIG_NETFILTER)"
-	ewarn "	   Connection tracking (CONFIG_IP_NF_CONNTRACK)"
-	ewarn "	   IP tables support (CONFIG_IP_NF_IPTABLES)"
-	ewarn "	   Packet filtering (CONFIG_IP_NF_FILTER)"
-	ewarn "	   Full NAT (CONFIG_IP_NF_NAT)"
-	ewarn "	   MASQUERADE target support (CONFIG_IP_NF_TARGET_MASQUERADE)"
-	echo
-}