Allow compilation/operation against seamonkey rather than mozilla

Package-Manager: portage-2.1.1_pre3-r4

6 files changed, 145 insertions, 16 deletions

diff --git a/net-news/blam/ChangeLog b/net-news/blam/ChangeLog
index e853010246e2..d3e0c9466286 100644
--- a/net-news/blam/ChangeLog
+++ b/net-news/blam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-news/blam
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/blam/ChangeLog,v 1.29 2005/12/05 15:15:02 herbs Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/blam/ChangeLog,v 1.30 2006/07/24 22:21:38 dsd Exp $
+
+  24 Jul 2006; Daniel Drake <dsd@gentoo.org>
+  +files/blam-1.8.2-seamonkey.patch, blam-1.8.2-r1.ebuild:
+  Allow compilation/operation against seamonkey rather than mozilla
 
 *blam-1.8.2-r1 (05 Dec 2005)
 
diff --git a/net-news/blam/Manifest b/net-news/blam/Manifest
index 864e737c84e8..edad814f0d67 100644
--- a/net-news/blam/Manifest
+++ b/net-news/blam/Manifest
@@ -1,24 +1,69 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2e49034e05c2a3f5c129ae078712559f ChangeLog 4504
-MD5 ab0b935822689433e94347df645b5de7 blam-1.6.1-r2.ebuild 995
-MD5 9f5a4eebb7a634d6e37b50d71a6be5e2 blam-1.8.0.ebuild 1096
-MD5 7d248ed9bdf3939197703406c306a7e4 blam-1.8.2-r1.ebuild 1148
-MD5 9341bf2fa885f3a5e883051dbad07224 blam-1.8.2.ebuild 1063
+AUX blam-1.6.0-gecko-fix.diff 614 RMD160 3432e9c1da6dd756760ef87abff55f24e3858088 SHA1 8a3a3c9a3338d58974ade7e89b6eccc7da8707a8 SHA256 bb36cf5b3a66e189d29c54758e73d72db1e62097d471a669879d5b98aee3af9b
 MD5 00f43721ad68695ca3870578cce4a220 files/blam-1.6.0-gecko-fix.diff 614
+RMD160 3432e9c1da6dd756760ef87abff55f24e3858088 files/blam-1.6.0-gecko-fix.diff 614
+SHA256 bb36cf5b3a66e189d29c54758e73d72db1e62097d471a669879d5b98aee3af9b files/blam-1.6.0-gecko-fix.diff 614
+AUX blam-1.6.1-mono-1.1.7-compat-v2.diff 768 RMD160 098bcf231fdce36d9cde437a45df1fa05755a050 SHA1 8bca81bf652d382d640f6332939102a023688f14 SHA256 87f69351fc39b9d01c8e9472aa8a14b559e21d51f4d48f73306efad0ff5b7188
 MD5 bc93c8091228ce883de5381bcd35c801 files/blam-1.6.1-mono-1.1.7-compat-v2.diff 768
+RMD160 098bcf231fdce36d9cde437a45df1fa05755a050 files/blam-1.6.1-mono-1.1.7-compat-v2.diff 768
+SHA256 87f69351fc39b9d01c8e9472aa8a14b559e21d51f4d48f73306efad0ff5b7188 files/blam-1.6.1-mono-1.1.7-compat-v2.diff 768
+AUX blam-1.6.1-mono-1.1.7-compat.diff 609 RMD160 214072177f031531181778bb2f9136886fac53ca SHA1 cf77155437aa0041551e221df0b5fef6ce7e5dc2 SHA256 833b672a353a00e19fc46b8dc82c313562857002c06a642304f1eeab88e09f45
 MD5 4d50c34081dae158dfee08c8f011571a files/blam-1.6.1-mono-1.1.7-compat.diff 609
+RMD160 214072177f031531181778bb2f9136886fac53ca files/blam-1.6.1-mono-1.1.7-compat.diff 609
+SHA256 833b672a353a00e19fc46b8dc82c313562857002c06a642304f1eeab88e09f45 files/blam-1.6.1-mono-1.1.7-compat.diff 609
+AUX blam-1.8.2-64-bit-int.diff 525 RMD160 37b0f5475fc38c97e73d0f4e4990f80f4b5994a9 SHA1 cc236305b85542fd714e72ba99464fb07f52cf72 SHA256 faebeae583dae6be4fb5c67a1d55f2609c6c407034b1714c5117a4265a62d6f8
 MD5 922cbea4975b2d4de2215d887bcf11e7 files/blam-1.8.2-64-bit-int.diff 525
+RMD160 37b0f5475fc38c97e73d0f4e4990f80f4b5994a9 files/blam-1.8.2-64-bit-int.diff 525
+SHA256 faebeae583dae6be4fb5c67a1d55f2609c6c407034b1714c5117a4265a62d6f8 files/blam-1.8.2-64-bit-int.diff 525
+AUX blam-1.8.2-seamonkey.patch 2872 RMD160 91d7482ef77db641f2a8d80f699ce93a4b0e8b83 SHA1 791f6ea4262b3a4c7c9694c230a66447a2f4168b SHA256 db2f41ff480153b1bb8b79e4f66e3e4ef74ea5f56556c41961041acf8c71f9f7
+MD5 5a11db48fad0ce43be9c20a1ec4e58ed files/blam-1.8.2-seamonkey.patch 2872
+RMD160 91d7482ef77db641f2a8d80f699ce93a4b0e8b83 files/blam-1.8.2-seamonkey.patch 2872
+SHA256 db2f41ff480153b1bb8b79e4f66e3e4ef74ea5f56556c41961041acf8c71f9f7 files/blam-1.8.2-seamonkey.patch 2872
+DIST blam-1.6.1.tar.gz 547665
+DIST blam-1.8.0.tar.gz 602378
+DIST blam-1.8.2.tar.gz 597408 RMD160 9bd3def31f431dae58ba707566b6e1156caed0ac SHA1 f15f5f45d7e94b950051a4a69b4d427e03f3f26d SHA256 ba97fb9d9a11b629b2be00d143b3239794e48a1ac12c382e3d7565970345f1c5
+EBUILD blam-1.6.1-r2.ebuild 995 RMD160 2894167e1cd53e6b0cd854ecf8868e3d27d48e0c SHA1 6e8e5a03f9693504456dac855580b1943c5ef92d SHA256 31710b9cd12139abb3bfdeff177df0ff76e110559e4dcf98b2b5f454eb934130
+MD5 ab0b935822689433e94347df645b5de7 blam-1.6.1-r2.ebuild 995
+RMD160 2894167e1cd53e6b0cd854ecf8868e3d27d48e0c blam-1.6.1-r2.ebuild 995
+SHA256 31710b9cd12139abb3bfdeff177df0ff76e110559e4dcf98b2b5f454eb934130 blam-1.6.1-r2.ebuild 995
+EBUILD blam-1.8.0.ebuild 1096 RMD160 388ac0ddbd530c0c59d34ca8750b0af41ac1795d SHA1 15a649871272b008a24c13140d38e90782c61bb6 SHA256 6deca86576abaa8ee753a5e3d416d0333bbee9b295db38299d0f6b3ff7cf4531
+MD5 9f5a4eebb7a634d6e37b50d71a6be5e2 blam-1.8.0.ebuild 1096
+RMD160 388ac0ddbd530c0c59d34ca8750b0af41ac1795d blam-1.8.0.ebuild 1096
+SHA256 6deca86576abaa8ee753a5e3d416d0333bbee9b295db38299d0f6b3ff7cf4531 blam-1.8.0.ebuild 1096
+EBUILD blam-1.8.2-r1.ebuild 1216 RMD160 abf1000ddcf83d142a034c9d75ed00963a5943e2 SHA1 5d44ffa7091865bcc60a72f791c765890c179279 SHA256 4b9111fbb9e2a392f50a6ca7cdfe68b4d31ed944430ffae59f6d8447e04951c2
+MD5 d31858519ff902780de64c09c1e8da17 blam-1.8.2-r1.ebuild 1216
+RMD160 abf1000ddcf83d142a034c9d75ed00963a5943e2 blam-1.8.2-r1.ebuild 1216
+SHA256 4b9111fbb9e2a392f50a6ca7cdfe68b4d31ed944430ffae59f6d8447e04951c2 blam-1.8.2-r1.ebuild 1216
+EBUILD blam-1.8.2.ebuild 1063 RMD160 f7f27d4b3f73e6632c43a99a750128c248ed6a94 SHA1 ef18db9a158ad4b37b88d33188d07f6c0a003161 SHA256 53fdc7bd0e433b9292c1eaa95c9783e847fc0548ad2e76beb6d15f80a08c019f
+MD5 9341bf2fa885f3a5e883051dbad07224 blam-1.8.2.ebuild 1063
+RMD160 f7f27d4b3f73e6632c43a99a750128c248ed6a94 blam-1.8.2.ebuild 1063
+SHA256 53fdc7bd0e433b9292c1eaa95c9783e847fc0548ad2e76beb6d15f80a08c019f blam-1.8.2.ebuild 1063
+MISC ChangeLog 4675 RMD160 11b7057c8a1f5b00a181b32073ae7edd88fda263 SHA1 922da413e598d7be0efddaa9db78237a23674bdf SHA256 5d2cfa1b97a4a7b069bd1a5007276d33531879664c145b5eef2dc805c4e26122
+MD5 9d666d9de3f9161f2b476ab9783dea6c ChangeLog 4675
+RMD160 11b7057c8a1f5b00a181b32073ae7edd88fda263 ChangeLog 4675
+SHA256 5d2cfa1b97a4a7b069bd1a5007276d33531879664c145b5eef2dc805c4e26122 ChangeLog 4675
+MISC metadata.xml 222 RMD160 aafa4baf96cfa37bca8b5af9961b253e8d54deeb SHA1 0adada1945fd52cf6649dbafddd2e4ebd84e3543 SHA256 2291d7f74fb8845472f5527edd49d2004d0626025dfc6622cbe6a8fe22dc846d
+MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
+RMD160 aafa4baf96cfa37bca8b5af9961b253e8d54deeb metadata.xml 222
+SHA256 2291d7f74fb8845472f5527edd49d2004d0626025dfc6622cbe6a8fe22dc846d metadata.xml 222
 MD5 687962557e8232ff8b5f5b6f93d2c0f6 files/digest-blam-1.6.1-r2 62
+RMD160 4b0d9661d581d230bd4ffea88ef397d01b34976d files/digest-blam-1.6.1-r2 62
+SHA256 7cb2ba318dabd936003da2bc370c337bbae7f23381131087c5b60d4eb59198d7 files/digest-blam-1.6.1-r2 62
 MD5 b12739b8bb161809852551f6f26d3af1 files/digest-blam-1.8.0 62
-MD5 898d64f02fd1e7c9f3afaa2b6d5cda29 files/digest-blam-1.8.2 62
-MD5 898d64f02fd1e7c9f3afaa2b6d5cda29 files/digest-blam-1.8.2-r1 62
-MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
+RMD160 99690b2e50c5f6bf047973d7f688a10cb148081b files/digest-blam-1.8.0 62
+SHA256 6fa0190c43cabbbd5107a0513d98600058bdd853a9de08cd8dd81c9f3f31f083 files/digest-blam-1.8.0 62
+MD5 1e5044ab16eb13c58bf1f01be68b3201 files/digest-blam-1.8.2 232
+RMD160 63ed7f5b0313e44c1dd9e10f4ae945a586c3a197 files/digest-blam-1.8.2 232
+SHA256 1eb7d4061a74cb13361ff8d743914f92060b611d8f96a96b68a53c01f75cc1e6 files/digest-blam-1.8.2 232
+MD5 1e5044ab16eb13c58bf1f01be68b3201 files/digest-blam-1.8.2-r1 232
+RMD160 63ed7f5b0313e44c1dd9e10f4ae945a586c3a197 files/digest-blam-1.8.2-r1 232
+SHA256 1eb7d4061a74cb13361ff8d743914f92060b611d8f96a96b68a53c01f75cc1e6 files/digest-blam-1.8.2-r1 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFDlFmC2G5bA0cA/ScRAoXmAJ9xgtJ08ER3M5t/5PqA7TbMK+XRXwCg3csu
-ICZgND3VSrL/OqhAuYN7Vm8=
-=Mpa5
+iD8DBQFExUnGTOXg++0VvJQRAhh5AJ9ZEjPOSSnFN29OZL0c2AnWAo7zowCeKK6z
+2taB/iOTiv30iLC2fFPFShY=
+=5uWg
 -----END PGP SIGNATURE-----
diff --git a/net-news/blam/blam-1.8.2-r1.ebuild b/net-news/blam/blam-1.8.2-r1.ebuild
index 7b1a043d8869..fe0a3d784982 100644
--- a/net-news/blam/blam-1.8.2-r1.ebuild
+++ b/net-news/blam/blam-1.8.2-r1.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/net-news/blam/blam-1.8.2-r1.ebuild,v 1.1 2005/12/05 15:15:02 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/blam/blam-1.8.2-r1.ebuild,v 1.2 2006/07/24 22:21:38 dsd Exp $
 
 inherit mono eutils
 
@@ -28,8 +28,12 @@ src_unpack() {
 			-e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
 			${S}/{,lib,libblam,src}/Makefile.{in,am} ${S}/blam.in || die
 	fi
+
 	# Fix for bug 94524, bad int definition
 	epatch ${FILESDIR}/${P}-64-bit-int.diff
+
+	# build against seamonkey
+	epatch ${FILESDIR}/${P}-seamonkey.patch
 }
 
 src_compile() {
diff --git a/net-news/blam/files/blam-1.8.2-seamonkey.patch b/net-news/blam/files/blam-1.8.2-seamonkey.patch
new file mode 100644
index 000000000000..841eaaef6adf
--- /dev/null
+++ b/net-news/blam/files/blam-1.8.2-seamonkey.patch
@@ -0,0 +1,72 @@
+From: Daniel Drake <dsd@gentoo.org>
+
+http://bugzilla.gnome.org/show_bug.cgi?id=346566
+
+Index: blam-1.8.2/configure.in
+===================================================================
+--- blam-1.8.2.orig/configure.in
++++ blam-1.8.2/configure.in
+@@ -70,7 +70,7 @@ AC_MSG_CHECKING([which mozilla to use])
+ 
+ MOZILLA=
+ AC_ARG_WITH([mozilla],
+-	AC_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|thunderbird@:>@],
++	AC_HELP_STRING([--with-mozilla@<:@=mozilla|seamonkey|firefox|thunderbird@:>@],
+ 		       [Whether to use mozilla, firefox or thunderbird gtkmozembed (default: mozilla)]),
+ 	[MOZILLA="$withval"])
+ 
+@@ -78,6 +78,8 @@ dnl try to autodetect: if mozilla exists
+ if test "x$MOZILLA" = "x"; then
+   if pkg-config --exists mozilla-gtkmozembed; then
+     MOZILLA=mozilla
++  elif pkg-config --exists seamonkey-gtkmozembed; then
++    MOZILLA=seamonkey
+   elif pkg-config --exists firefox-gtkmozembed; then
+     MOZILLA=firefox
+   elif pkg-config --exists thunderbird-gtkmozembed; then
+@@ -85,7 +87,7 @@ if test "x$MOZILLA" = "x"; then
+   else
+     AC_MSG_ERROR([no mozilla installation found])
+   fi
+-elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird"; then
++elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird" -a "x$with_mozilla" != "xseamonkey"; then
+   AC_MSG_ERROR([unknown mozilla name ($MOZILLA)])
+ fi
+ 
+@@ -95,6 +97,7 @@ AC_MSG_RESULT([$MOZILLA])
+ 
+ case "$MOZILLA" in
+ mozilla) min_version=1.7 flavour=mozilla ;;
++seamonkey) min_version=1.0 flavour=mozilla ;;
+ firefox) min_version=0.10 flavour=toolkit ;;
+ thunderbird) min_version=0.8 flavour=toolkit ;;
+ esac
+@@ -205,6 +208,12 @@ dnl changed from nsIXULChromeRegistry in
+ AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/chrome/nsIChromeRegistrySea.h],
+ 	[AC_DEFINE([HAVE_CHROME_NSICHROMEREGISTRYSEA_H], [1], [Define if nsIChromeRegistrySea.h exists])])
+ 
++
++dnl do_GetService moved here in recent mozilla code
++
++AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/xpcom/nsServiceManagerUtils.h],
++		[AC_DEFINE([HAVE_XPCOM_NSSERVICEMANAGERUTILS_H], [1], [Define if nsServiceManagerUtils.h exists])])
++
+ MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
+ AC_SUBST(MOZILLA_WARN_CXXFLAGS)
+ 
+Index: blam-1.8.2/libblam/blam-gecko-utils.cpp
+===================================================================
+--- blam-1.8.2.orig/libblam/blam-gecko-utils.cpp
++++ blam-1.8.2/libblam/blam-gecko-utils.cpp
+@@ -29,6 +29,11 @@
+ #include <nsEmbedString.h>
+ #include <nsIPrefService.h>
+ #include <nsIServiceManager.h>
++#include <nsCOMPtr.h>
++
++#if defined(HAVE_XPCOM_NSSERVICEMANAGERUTILS_H)
++#include <nsServiceManagerUtils.h>
++#endif
+ 
+ #if defined (HAVE_CHROME_NSICHROMEREGISTRYSEA_H)
+ #include <chrome/nsIChromeRegistrySea.h>
diff --git a/net-news/blam/files/digest-blam-1.8.2 b/net-news/blam/files/digest-blam-1.8.2
index 424cdf949505..9d8b10b99d84 100644
--- a/net-news/blam/files/digest-blam-1.8.2
+++ b/net-news/blam/files/digest-blam-1.8.2
@@ -1 +1,3 @@
 MD5 8cb05faedf60d895d94a5ecf9d10eb8f blam-1.8.2.tar.gz 597408
+RMD160 9bd3def31f431dae58ba707566b6e1156caed0ac blam-1.8.2.tar.gz 597408
+SHA256 ba97fb9d9a11b629b2be00d143b3239794e48a1ac12c382e3d7565970345f1c5 blam-1.8.2.tar.gz 597408
diff --git a/net-news/blam/files/digest-blam-1.8.2-r1 b/net-news/blam/files/digest-blam-1.8.2-r1
index 424cdf949505..9d8b10b99d84 100644
--- a/net-news/blam/files/digest-blam-1.8.2-r1
+++ b/net-news/blam/files/digest-blam-1.8.2-r1
@@ -1 +1,3 @@
 MD5 8cb05faedf60d895d94a5ecf9d10eb8f blam-1.8.2.tar.gz 597408
+RMD160 9bd3def31f431dae58ba707566b6e1156caed0ac blam-1.8.2.tar.gz 597408
+SHA256 ba97fb9d9a11b629b2be00d143b3239794e48a1ac12c382e3d7565970345f1c5 blam-1.8.2.tar.gz 597408