Bump to 0.2 release, which doesn't work any better for me than the previous

stuff, but hey maybe this pmasked package will work for somebody #75167
#78374 #80902 #80829
Package-Manager: portage-2.0.51.22-r2

7 files changed, 45 insertions, 98 deletions

diff --git a/app-office/mozilla-sunbird-bin/ChangeLog b/app-office/mozilla-sunbird-bin/ChangeLog
index f494ec097838..5ae1350114e0 100644
--- a/app-office/mozilla-sunbird-bin/ChangeLog
+++ b/app-office/mozilla-sunbird-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/mozilla-sunbird-bin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/ChangeLog,v 1.6 2005/03/23 20:03:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/ChangeLog,v 1.7 2005/07/25 03:37:46 agriffis Exp $
+
+*mozilla-sunbird-bin-0.2 (25 Jul 2005)
+
+  25 Jul 2005; Aron Griffis <agriffis@gentoo.org>
+  +mozilla-sunbird-bin-0.2.ebuild, -mozilla-sunbird-bin-0.2.20040812.ebuild,
+  -mozilla-sunbird-bin-0.2.20041112.ebuild:
+  Bump to 0.2 release, which doesn't work any better for me than the previous
+  stuff, but hey maybe this pmasked package will work for somebody #75167
+  #78374 #80902 #80829
 
   23 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
   mozilla-sunbird-bin-0.2.20040812.ebuild,
diff --git a/app-office/mozilla-sunbird-bin/Manifest b/app-office/mozilla-sunbird-bin/Manifest
index 76c8ea60d029..902da1086762 100644
--- a/app-office/mozilla-sunbird-bin/Manifest
+++ b/app-office/mozilla-sunbird-bin/Manifest
@@ -1,8 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ea63e8b96dcfea5185ce681d1e92357b ChangeLog 1668
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 686cec612a65525a5bcb1a09dae34709 mozilla-sunbird-bin-0.2.20040812.ebuild 1821
-MD5 ef93cadd3ea2b8e08c555d16289765ea ChangeLog 1280
-MD5 1552ba9c32baa1dfa16313e06d353142 mozilla-sunbird-bin-0.2.20041112.ebuild 1821
-MD5 f7ff8c3d10e4af0dc6b1cff980261255 files/digest-mozilla-sunbird-bin-0.2.20041112 80
-MD5 e0bba3fd8ec5b2e7a7894d053162e4ad files/digest-mozilla-sunbird-bin-0.2.20040812 80
+MD5 b0c021e1c7393ba57e37ef1aa4c46f4a mozilla-sunbird-bin-0.2.ebuild 1796
+MD5 4b0b77beb6e9d3122c6101aa5f37b6a2 files/digest-mozilla-sunbird-bin-0.2 84
 MD5 4496a3c35ce5936332ac41702c3e32f7 files/icon/mozillasunbird-bin.desktop 199
 MD5 fa424078d248f495300ecc507858beb2 files/icon/mozillasunbird-bin-icon.png 6418
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC5F6WBXaUFmZvwyMRAh/CAJ9MTYZ0ViV1/PXlxKY+bCKXoQxfywCfcqXa
+35gUa1fBhYfLEVGT0uRHqys=
+=lmB8
+-----END PGP SIGNATURE-----
diff --git a/app-office/mozilla-sunbird-bin/files/digest-mozilla-sunbird-bin-0.2 b/app-office/mozilla-sunbird-bin/files/digest-mozilla-sunbird-bin-0.2
new file mode 100644
index 000000000000..c8d7080e0028
--- /dev/null
+++ b/app-office/mozilla-sunbird-bin/files/digest-mozilla-sunbird-bin-0.2
@@ -0,0 +1 @@
+MD5 3223d5c9862bd0d0179f62db8a03eb65 sunbird-0.2-i686-linux-gtk2+xft.tar.gz 6955714
diff --git a/app-office/mozilla-sunbird-bin/files/digest-mozilla-sunbird-bin-0.2.20040812 b/app-office/mozilla-sunbird-bin/files/digest-mozilla-sunbird-bin-0.2.20040812
deleted file mode 100644
index ed122de3a661..000000000000
--- a/app-office/mozilla-sunbird-bin/files/digest-mozilla-sunbird-bin-0.2.20040812
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eb3792bce4a834f89f7f9d8a3ee17093 sunbird-i686-linux-gtk2+xft.tar.gz 8318229
diff --git a/app-office/mozilla-sunbird-bin/files/digest-mozilla-sunbird-bin-0.2.20041112 b/app-office/mozilla-sunbird-bin/files/digest-mozilla-sunbird-bin-0.2.20041112
deleted file mode 100644
index efa350453745..000000000000
--- a/app-office/mozilla-sunbird-bin/files/digest-mozilla-sunbird-bin-0.2.20041112
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b70e2d9fbcdca521aa1775ab03b21e85 sunbird-i686-linux-gtk2+xft.tar.gz 8644149
diff --git a/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.20041112.ebuild b/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.20041112.ebuild
deleted file mode 100644
index 2e3436959683..000000000000
--- a/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.20041112.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.20041112.ebuild,v 1.5 2005/03/23 20:03:48 seemant Exp $
-
-inherit mozilla-launcher
-
-MY_PV=${PV##*.} ; MY_PV=${MY_PV:0:4}-${MY_PV:4:2}-${MY_PV:6:2}
-DESCRIPTION="The Mozilla Sunbird Calendar"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/${MY_PV}/sunbird-i686-linux-gtk2+xft.tar.gz"
-HOMEPAGE="http://www.mozilla.org/projects/calendar/sunbird.html"
-# can't mirror because the name isn't unique
-RESTRICT="nostrip nomirror"
-
-KEYWORDS="-* ~x86 ~amd64"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE=""
-S=${WORKDIR}/sunbird
-
-DEPEND="virtual/libc"
-RDEPEND="virtual/x11
-	x86? (
-		>=sys-libs/lib-compat-1.0-r2
-		>=x11-libs/gtk+-2.2
-	)
-	amd64? (
-		>=app-emulation/emul-linux-x86-baselibs-1.0
-		>=app-emulation/emul-linux-x86-gtklibs-1.0
-	)
-	virtual/x11
-	>=www-client/mozilla-launcher-1.18"
-
-src_install() {
-	# Install sunbird in /opt
-	dodir /opt
-	mv ${S} ${D}/opt/sunbird
-
-	# Fixing permissions
-	chown -R root:root ${D}/opt/sunbird
-
-	# mozilla-launcher-1.8 supports -bin versions
-	dodir /usr/bin
-	dosym /usr/libexec/mozilla-launcher /usr/bin/sunbird-bin
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozillasunbird-bin-icon.png
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozillasunbird-bin.desktop
-}
-
-pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/opt/sunbird
-
-	# Remove entire installed instance to prevent all kinds of
-	# problems... see bug 44772 for example
-	rm -rf "${MOZILLA_FIVE_HOME}"
-}
-
-pkg_postinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/opt/sunbird
-
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	update_mozilla_launcher_symlinks
-}
diff --git a/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.20040812.ebuild b/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.ebuild
index 037d2c28aacf..7413a5434e68 100644
--- a/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.20040812.ebuild
+++ b/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.ebuild
@@ -1,21 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.20040812.ebuild,v 1.5 2005/03/23 20:03:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird-bin/mozilla-sunbird-bin-0.2.ebuild,v 1.1 2005/07/25 03:37:46 agriffis Exp $
 
-inherit mozilla-launcher
+inherit mozilla-launcher multilib
 
-MY_PV=${PV##*.} ; MY_PV=${MY_PV:0:4}-${MY_PV:4:2}-${MY_PV:6:2}
 DESCRIPTION="The Mozilla Sunbird Calendar"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/nightly/${MY_PV}/sunbird-i686-linux-gtk2+xft.tar.gz"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/${PV}/sunbird-${PV}-i686-linux-gtk2+xft.tar.gz"
 HOMEPAGE="http://www.mozilla.org/projects/calendar/sunbird.html"
-# can't mirror because the name isn't unique
-RESTRICT="nostrip nomirror"
+RESTRICT="nostrip"
 
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* ~amd64 ~x86"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 IUSE=""
-S=${WORKDIR}/sunbird
 
 DEPEND="virtual/libc"
 RDEPEND="virtual/x11
@@ -27,20 +24,24 @@ RDEPEND="virtual/x11
 		>=app-emulation/emul-linux-x86-baselibs-1.0
 		>=app-emulation/emul-linux-x86-gtklibs-1.0
 	)
-	virtual/x11
-	>=www-client/mozilla-launcher-1.18"
+	>=www-client/mozilla-launcher-1.42"
+
+S=${WORKDIR}/sunbird
+
+# This is a binary x86 package => ABI=x86
+# Please keep this in future versions
+# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
+has_multilib_profile && ABI="x86"
 
 src_install() {
-	# Install sunbird in /opt
-	dodir /opt
-	mv ${S} ${D}/opt/sunbird
+	declare MOZILLA_FIVE_HOME=/opt/sunbird
 
-	# Fixing permissions
-	chown -R root:root ${D}/opt/sunbird
+	# Install sunbird in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv ${S} ${D}${MOZILLA_FIVE_HOME}
 
-	# mozilla-launcher-1.8 supports -bin versions
-	dodir /usr/bin
-	dosym /usr/libexec/mozilla-launcher /usr/bin/sunbird-bin
+	# Create /usr/bin/sunbird-bin
+	install_mozilla_launcher_stub sunbird-bin ${MOZILLA_FIVE_HOME}
 
 	# Install icon and .desktop for menu entry
 	insinto /usr/share/pixmaps
@@ -50,16 +51,14 @@ src_install() {
 }
 
 pkg_preinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/opt/sunbird
+	declare MOZILLA_FIVE_HOME=/opt/sunbird
 
 	# Remove entire installed instance to prevent all kinds of
 	# problems... see bug 44772 for example
-	rm -rf "${MOZILLA_FIVE_HOME}"
+	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
 }
 
 pkg_postinst() {
-	export MOZILLA_FIVE_HOME=${ROOT}/opt/sunbird
-
 	update_mozilla_launcher_symlinks
 }