Remove makemake, it's too high maintenance.

4 files changed, 81 insertions, 30 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index fb0a45284f45..cb7345c150c7 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.101 2003/07/08 21:42:49 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.102 2003/07/09 23:06:53 brad Exp $
+
+  09 Jul 2003; Brad Laue <brad@gentoo.org> mozilla-1.4.ebuild,
+  files/enigmail-0.76.1-Makefile:
+  Remove makemake from the ebuild and return to the practice of a prebuilt
+  makefile for enigmail - too many dependency problems were caused by one simple
+  script.
 
   08 Jul 2003; Tavis Ormandy <taviso@gentoo.org> mozilla-1.4.ebuild:
   explicitly link with libX11 on alpha.
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index 59687deb5968..8d696f305f60 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,42 +1,43 @@
-MD5 f9f43dd3dc176189f1a5da3eb5698767 mozilla-1.3-r1.ebuild 16657
+MD5 af41c50d0ab12104a181d486243c4e02 ChangeLog 18318
 MD5 97c3777f17c2b6c320c2fa9fba74041f mozilla-1.0.1-r3.ebuild 15212
-MD5 76ef7630fe078349011a93b73e980f36 mozilla-1.4.ebuild 16635
 MD5 4855edccbe0b8fcb1ee7dfb4cc3fb71a mozilla-1.1-r1.ebuild 14822
-MD5 5244675fb2e956e4a020f7389dd74709 mozilla-1.3-r2.ebuild 16662
-MD5 52e4c520a7cb587c00a03cf7c4a04f06 ChangeLog 18056
 MD5 de55659daa79b5c545b604ab3def7963 mozilla-1.2.1-r5.ebuild 20931
-MD5 e239c459343aa377a9c1a6fd0239e4c9 files/mozilla-1.0-asmfixes.patch 9089
-MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
-MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
-MD5 4749f0978ad569b9bcf028c75b5de9cc files/mozilla-1.0-abi-xpcom-ppc.patch 12433
-MD5 937ecdca5b59d442c2b0b5027ead762d files/mozilla-1.0-abi-compat-wrappers.patch 1799
+MD5 f9f43dd3dc176189f1a5da3eb5698767 mozilla-1.3-r1.ebuild 16657
+MD5 5244675fb2e956e4a020f7389dd74709 mozilla-1.3-r2.ebuild 16662
+MD5 138ac5df0ecfde4549f2f0d2a4770588 mozilla-1.4.ebuild 16677
+MD5 2245cc4f37902e2c6dd188f72874fbb3 files/10mozilla 60
+MD5 cf872ecce56e05c488ae7f41b50dec31 files/digest-mozilla-1.0.1-r3 281
 MD5 eccaf421f7e91faad5f835cadca4263e files/digest-mozilla-1.1-r1 202
+MD5 08ca97500d420d77f99f60d5eeb54c1f files/digest-mozilla-1.2.1-r5 268
 MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r1 201
-MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r2 201
+MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
+MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
 MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
-MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 2245cc4f37902e2c6dd188f72874fbb3 files/10mozilla 60
+MD5 937ecdca5b59d442c2b0b5027ead762d files/mozilla-1.0-abi-compat-wrappers.patch 1799
+MD5 4749f0978ad569b9bcf028c75b5de9cc files/mozilla-1.0-abi-xpcom-ppc.patch 12433
+MD5 e239c459343aa377a9c1a6fd0239e4c9 files/mozilla-1.0-asmfixes.patch 9089
+MD5 2428c0ad22b38f773fb9c174722909de files/mozilla-1.0.1-platform.patch 3543
 MD5 1c48ae2eab3e01fae125748d40917e79 files/mozilla-1.0.1-sparc-xpcom.patch 4267
+MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
+MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
+MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
 MD5 5b01d0425f9ef7bbe0765985e6041c6b files/mozilla.sh 6684
 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
-MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
-MD5 cf872ecce56e05c488ae7f41b50dec31 files/digest-mozilla-1.0.1-r3 281
-MD5 08ca97500d420d77f99f60d5eeb54c1f files/digest-mozilla-1.2.1-r5 268
-MD5 2428c0ad22b38f773fb9c174722909de files/mozilla-1.0.1-platform.patch 3543
+MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r2 201
 MD5 614b93ca61ff42ba48eb6a5e617f0953 files/digest-mozilla-1.4 201
-MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
-MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
-MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
-MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-0.76.1-Makefile 1560
+MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
 MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
-MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
+MD5 f103c0c7a936a1dd20ecce0d29ebba54 files/1.2/mozilla-1.2-image-reload-memleak.patch 1534
 MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605
-MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
 MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387
-MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
-MD5 f103c0c7a936a1dd20ecce0d29ebba54 files/1.2/mozilla-1.2-image-reload-memleak.patch 1534
+MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
+MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
 MD5 696d4810f2ccb8f2bcb0275fa13c67b9 files/1.2/mozilla-1.2b-gtk2.patch.bz2 6091
+MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
+MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
 MD5 1655fea18e9fc538b41d88561d6080c7 files/1.3/mozilla-1.3-fix-gtkim.patch 921
-MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
 MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
+MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
diff --git a/net-www/mozilla/files/enigmail-0.76.1-Makefile b/net-www/mozilla/files/enigmail-0.76.1-Makefile
new file mode 100644
index 000000000000..c6a95caba45d
--- /dev/null
+++ b/net-www/mozilla/files/enigmail-0.76.1-Makefile
@@ -0,0 +1,45 @@
+#!gmake
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "MPL"); you may not use this file
+# except in compliance with the MPL. You may obtain a copy of
+# the MPL at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the MPL is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the MPL for the specific language governing
+# rights and limitations under the MPL.
+# 
+# The Original Code is Enigmail.
+# 
+# The Initial Developer of the Original Code is Ramalingam Saravanan.
+# Portions created by Ramalingam Saravanan <svn@xmlterm.org> are
+# Copyright (C) 2001 Ramalingam Saravanan. All Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License (the "GPL"), in which case
+# the provisions of the GPL are applicable instead of
+# those above. If you wish to allow use of your version of this
+# file only under the terms of the GPL and not to allow
+# others to use your version of this file under the MPL, indicate
+# your decision by deleting the provisions above and replace them
+# with the notice and other provisions required by the GPL.
+# If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+DEPTH		= ../..
+topsrcdir	= ../..
+srcdir		= .
+VPATH		= .
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = public src build ui package
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
diff --git a/net-www/mozilla/mozilla-1.4.ebuild b/net-www/mozilla/mozilla-1.4.ebuild
index b183b1c08ddb..4830c6750594 100644
--- a/net-www/mozilla/mozilla-1.4.ebuild
+++ b/net-www/mozilla/mozilla-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.4.ebuild,v 1.4 2003/07/08 21:42:49 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.4.ebuild,v 1.5 2003/07/09 23:06:53 brad Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome"
 # Internal USE flags that I do not really want to advertise ...
@@ -81,8 +81,7 @@ RDEPEND=">=x11-base/xfree-4.2.0-r11
 	        =dev-libs/glib-1.2* )
 	gtk2?  ( >=x11-libs/pango-1.2.1 )
 	java?  ( virtual/jre )
-	crypt? ( >=app-crypt/gnupg-1.2.1 
-		app-shells/tcsh )"
+	crypt? ( >=app-crypt/gnupg-1.2.1 )"
 
 DEPEND="${RDEPEND}
 	virtual/x11
@@ -150,6 +149,7 @@ src_unpack() {
 	then
 		mv -f ${WORKDIR}/ipc ${S}/extensions/
 		mv -f ${WORKDIR}/enigmail ${S}/extensions/
+		cp ${FILESDIR}/enigmail-0.76.1-Makefile ${S}/extensions/enigmail/Makefile
 	fi
 }
 
@@ -392,7 +392,6 @@ src_compile() {
 		make || die
 
 		cd ${S}/extensions/enigmail
-		./makemake
 		make || die
 	fi
 }