Updated gecko-sdk ebuild to install into correct lib directory.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 22 insertions, 73 deletions

diff --git a/net-libs/gecko-sdk/ChangeLog b/net-libs/gecko-sdk/ChangeLog
index 862044e9798f..b9b8b360a574 100644
--- a/net-libs/gecko-sdk/ChangeLog
+++ b/net-libs/gecko-sdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/gecko-sdk
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/ChangeLog,v 1.13 2005/06/27 23:38:53 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/ChangeLog,v 1.14 2005/07/11 22:02:57 josejx Exp $
+
+*gecko-sdk-1.7.8 (11 Jul 2005)
+
+  11 Jul 2005; Joseph Jezak <josejx@gentoo.org>
+  -files/gecko-sdk-1.7.5-gcc4.patch, -gecko-sdk-1.7.5.ebuild,
+  +gecko-sdk-1.7.8.ebuild:
+  Updated gecko-sdk ebuild to install into correct lib directory.
 
   27 Jun 2005; Sven Wegener <swegener@gentoo.org> gecko-sdk-1.7.5.ebuild:
   Changed 'pgsql?' to 'postgres?' in *DEPEND. Added mozsvg to IUSE.
diff --git a/net-libs/gecko-sdk/Manifest b/net-libs/gecko-sdk/Manifest
index 35f26bdc2c3e..70856228c83e 100644
--- a/net-libs/gecko-sdk/Manifest
+++ b/net-libs/gecko-sdk/Manifest
@@ -1,15 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6d2d5893abb56d2a7e9699c025310f06 ChangeLog 2057
-MD5 5d946445ba7bba30fb129f941bc7e84b files/digest-gecko-sdk-1.7.5 203
-MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/gecko-sdk-1.7.5-gcc4.patch 1818
-MD5 8f56a575c2c647d2e91ed0cf331dcd87 gecko-sdk-1.7.5.ebuild 6748
+MD5 5a6f53058dc7672f746cb71a89d3ce33 ChangeLog 2291
 MD5 66c156160ef60780ee4c80a28873e766 metadata.xml 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCwI4aI1lqEGTUzyQRAtsKAKDHfBondFfxKW1YRSnfH489s4CS1QCgmf+j
-xyDYftDJWP0+3mH5dQt6mDY=
-=/zqJ
------END PGP SIGNATURE-----
+MD5 7297b847a9f0fadad2c55425d8f49f97 gecko-sdk-1.7.8.ebuild 6801
+MD5 5d946445ba7bba30fb129f941bc7e84b files/digest-gecko-sdk-1.7.8 203
diff --git a/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.5 b/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.8
index 5048d5eba16d..5048d5eba16d 100644
--- a/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.5
+++ b/net-libs/gecko-sdk/files/digest-gecko-sdk-1.7.8
diff --git a/net-libs/gecko-sdk/files/gecko-sdk-1.7.5-gcc4.patch b/net-libs/gecko-sdk/files/gecko-sdk-1.7.5-gcc4.patch
deleted file mode 100644
index 2d0a04949072..000000000000
--- a/net-libs/gecko-sdk/files/gecko-sdk-1.7.5-gcc4.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h
---- mozilla-orig/security/nss/lib/pki1/oiddata.h	2005-03-13 19:12:25.000000000 -0500
-+++ mozilla/security/nss/lib/pki1/oiddata.h	2005-03-13 19:15:19.000000000 -0500
-@@ -43,12 +43,6 @@
- #include "nsspki1t.h"
- #endif /* NSSPKI1T_H */
- 
--extern const NSSOID nss_builtin_oids[];
--extern const PRUint32 nss_builtin_oid_count;
--
--/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
--/*extern const PRUint32 nss_attribute_type_alias_count;*/
--
- extern const NSSOID *NSS_OID_RFC1274_UID;
- extern const NSSOID *NSS_OID_RFC1274_EMAIL;
- extern const NSSOID *NSS_OID_RFC2247_DC;
-diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl
---- mozilla-orig/security/nss/lib/pki1/oidgen.perl	2005-03-13 19:12:25.000000000 -0500
-+++ mozilla/security/nss/lib/pki1/oidgen.perl	2005-03-13 19:15:19.000000000 -0500
-@@ -233,12 +233,6 @@
- #include "nsspki1t.h"
- #endif /* NSSPKI1T_H */
- 
--extern const NSSOID nss_builtin_oids[];
--extern const PRUint32 nss_builtin_oid_count;
--
--/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
--/*extern const PRUint32 nss_attribute_type_alias_count;*/
--
- EOD
-     ;
- 
-diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h
---- mozilla-orig/security/nss/lib/pki1/pki1.h	2005-03-13 19:12:25.000000000 -0500
-+++ mozilla/security/nss/lib/pki1/pki1.h	2005-03-13 19:15:19.000000000 -0500
-@@ -55,7 +55,9 @@
- 
- PR_BEGIN_EXTERN_C
- 
--/* fgmr 19990505 moved these here from oiddata.h */
-+extern const NSSOID nss_builtin_oids[];
-+extern const PRUint32 nss_builtin_oid_count;
-+
- extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
- extern const PRUint32 nss_attribute_type_alias_count;
- 
diff --git a/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild b/net-libs/gecko-sdk/gecko-sdk-1.7.8.ebuild
index 3928fba6601a..ca7c2f3d5214 100644
--- a/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild
+++ b/net-libs/gecko-sdk/gecko-sdk-1.7.8.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/gecko-sdk-1.7.5.ebuild,v 1.8 2005/06/27 23:38:53 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gecko-sdk/gecko-sdk-1.7.8.ebuild,v 1.1 2005/07/11 22:02:57 josejx Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic toolchain-funcs eutils nsplugins mozilla-launcher mozconfig makeedit multilib
 
-IUSE="java crypt ssl moznomail postgres mozsvg"
+IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg mozxmlterm postgres ssl"
 
 EMVER="0.91.0"
 IPCVER="1.1.3"
-MOZVER="1.7.8"
 
 # handle _rc versions
-MY_PV=${MOZVER/_alpha/a} 	# handle alpha
+MY_PV=${PV/_alpha/a} 	# handle alpha
 MY_PV=${MY_PV/_beta/b}	# handle beta
 MY_PV=${MY_PV/_rc/rc}	# handle rc
 
-DESCRIPTION="Gecko SDK for building applications based on Gecko"
+DESCRIPTION="Gecko SDK for building applications based on Gecko."
 HOMEPAGE="http://www.mozilla.org"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${MY_PV}/source/mozilla-${MY_PV}-source.tar.bz2
 	crypt? ( !moznomail? (
@@ -52,7 +51,7 @@ src_unpack() {
 	unpack ${A} || die "unpack failed"
 	cd ${S} || die "cd failed"
 
-	if ! [[ $(gcc-major-version) -eq 2 ]]; then
+	if [[ $(gcc-major-version) -eq 3 ]]; then
 		# ABI Patch for alpha/xpcom for gcc-3.x
 		if [[ ${ARCH} == alpha ]]; then
 			epatch ${PORTDIR}/www-client/mozilla/files/mozilla-alpha-xpcom-subs-fix.patch
@@ -86,13 +85,13 @@ src_unpack() {
 	# Fix building with gcc4
 	epatch ${PORTDIR}/www-client/mozilla/files/mozilla-1.7.6-gcc4.patch
 
+	# Fix building on amd64 with gcc4 (patch from Debian)
+	epatch ${PORTDIR}/www-client/mozilla/files/mozilla-${PV}-amd64.patch
+
 	# Mozilla Bug 292257, https://bugzilla.mozilla.org/show_bug.cgi?id=292257
 	# Mozilla crashes under some rare cases when plugin.default_plugin_disabled
 	# is true. This patch fixes that. Backported by hansmi@gentoo.org.
-	epatch ${PORTDIR}/www-client/mozilla/files/mozilla-${MOZVER}-objectframefix.diff
-
-	# Fix building on amd64 with gcc4 (patch from Debian)
-	epatch ${PORTDIR}/www-client/mozilla/files/mozilla-${MOZVER}-amd64.patch
+	epatch ${PORTDIR}/www-client/mozilla/files/mozilla-${PV}-objectframefix.diff
 
 	# Fix scripts that call for /usr/local/bin/perl #51916
 	ebegin "Patching smime to call perl from /usr/bin"
@@ -213,6 +212,6 @@ src_compile() {
 
 src_install() {
 	cd ${S}/dist
-	mkdir -p ${D}/usr/share
-	cp -RL sdk ${D}/usr/share/gecko-sdk
+	mkdir -p ${D}/usr/$(get_libdir)
+	cp -RL sdk ${D}/usr/$(get_libdir)/gecko-sdk
 }