Add patchset to fix bug 165777 and bug 168893

Package-Manager: portage-2.1.2.1-r1

5 files changed, 30 insertions, 45 deletions

diff --git a/app-office/mozilla-sunbird/ChangeLog b/app-office/mozilla-sunbird/ChangeLog
index de1da5a225e0..d6e82d8ff88a 100644
--- a/app-office/mozilla-sunbird/ChangeLog
+++ b/app-office/mozilla-sunbird/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/mozilla-sunbird
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/ChangeLog,v 1.5 2007/03/04 07:20:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/ChangeLog,v 1.6 2007/03/07 13:36:01 armin76 Exp $
+
+  07 Mar 2007; Raúl Porcel <armin76@gentoo.org>
+  -files/mozilla-sunbird-0.3-add-missing-LDFLAGS.patch,
+  mozilla-sunbird-0.3.1.ebuild:
+  Add patchset to fix bug 165777 and bug 168893
 
   04 Mar 2007; Marius Mauch <genone@gentoo.org>
   mozilla-sunbird-0.3.1.ebuild:
diff --git a/app-office/mozilla-sunbird/Manifest b/app-office/mozilla-sunbird/Manifest
index 79f22f09faf8..f46d76630cce 100644
--- a/app-office/mozilla-sunbird/Manifest
+++ b/app-office/mozilla-sunbird/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX icon/mozilla-sunbird-icon.png 6418 RMD160 92df6105a3ba07f961d5a54000e772791f1d89ac SHA1 e4e23c74234d688040f6cdaff4ace7f71d69dce4 SHA256 792fa9c96e825a0ba5d9f837910386dcb819e215fcc18c00936718823dee076e
 MD5 fa424078d248f495300ecc507858beb2 files/icon/mozilla-sunbird-icon.png 6418
 RMD160 92df6105a3ba07f961d5a54000e772791f1d89ac files/icon/mozilla-sunbird-icon.png 6418
@@ -17,10 +14,7 @@ AUX icon/mozilla-sunbird.desktop 185 RMD160 1801880f5b591989f2f3969f130fcda2b484
 MD5 f3fedf0b7ee7f9f1676f61f99697fbcc files/icon/mozilla-sunbird.desktop 185
 RMD160 1801880f5b591989f2f3969f130fcda2b484a9a7 files/icon/mozilla-sunbird.desktop 185
 SHA256 976d28d8faa05ab43636a0188e9b7bdf00c91f1542ec62e12dd86bc3bf3c6133 files/icon/mozilla-sunbird.desktop 185
-AUX mozilla-sunbird-0.3-add-missing-LDFLAGS.patch 227 RMD160 d2faf0a4a29c5fc121453d02358e01e4f7e3f19c SHA1 164c5a53e7e5f8ed5d2cee2e5268598f8f08d1e9 SHA256 ffce4bfc913800bdf69385620f483f1e8e43c5874fad4283cc94a8ba322e983d
-MD5 72b8e672d18d07325219da2b4dd39ca2 files/mozilla-sunbird-0.3-add-missing-LDFLAGS.patch 227
-RMD160 d2faf0a4a29c5fc121453d02358e01e4f7e3f19c files/mozilla-sunbird-0.3-add-missing-LDFLAGS.patch 227
-SHA256 ffce4bfc913800bdf69385620f483f1e8e43c5874fad4283cc94a8ba322e983d files/mozilla-sunbird-0.3-add-missing-LDFLAGS.patch 227
+DIST mozilla-sunbird-0.3.1-patches-0.1.tar.bz2 7278 RMD160 9581a3e0e5c4046b66c3c55b9ac0e6450236cc17 SHA1 8cfe1847fb2e102e9cbb7898788641ae96860c43 SHA256 17db0a41a69f27314863224ced2ddaf969b25ec8fb1655a1658322cf7c8dcfc2
 DIST sunbird-0.3.1.ca.langpack.xpi 97999 RMD160 6fd1af114e4f07931e6e32d43bc7a9bc330e8ee1 SHA1 aa35b5eb3d907243e55641b984d44e349135b765 SHA256 b84be9cb13e964b5dc1da857df19c78b946f4b4e4b4f8967527582873b9857ae
 DIST sunbird-0.3.1.cs.langpack.xpi 98057 RMD160 e4b31720187548342031f3e29bca0c7b1e7106a8 SHA1 fddd89ddf6bd0611d59c9d70184ca4e18d495612 SHA256 96e14ff8ddf254ddef8a997bb682a73d9d0de915dc928ce1e69600fe7d351676
 DIST sunbird-0.3.1.da.langpack.xpi 95991 RMD160 0d7f94a1ebb7dcd90c12bd3a6f2ade16a68b1cc9 SHA1 5df50a460b13ca33ec0a68cf0397dfd588dd95fa SHA256 ef39c0f14f05ab74e676282a8c3d4381d335daa9ee46a1950d97ad6c48879696
@@ -37,25 +31,18 @@ DIST sunbird-0.3.1.ru.langpack.xpi 106451 RMD160 9f572d0f0fbd9154d5546d2e7eff24a
 DIST sunbird-0.3.1.sk.langpack.xpi 102414 RMD160 fe54e5596d14164daeeb9f8fe89ee26ccedabbdb SHA1 9769e17981d49958021a5a6e5bda2fdbebc0efbb SHA256 19c66831cce0683c1025228f49f461252210fea566e3047c9cab3aa1ea59a01a
 DIST sunbird-0.3.1.sl.langpack.xpi 97817 RMD160 7c4fc023bb209bbc0aab1725bfe57f2a21a238bd SHA1 a2445d5b6f77247b8e946a5df7e53ada7c3301ee SHA256 bab139be5765516c3807f420b56154b6ccba8475eb152247e69e6bcdd13d52c4
 DIST sunbird-0.3.1.source.tar.bz2 44088609 RMD160 b2fe3d03ce20500641e18da07fafda031d7b882e SHA1 f8a397746f0e3abf15273de5232c447746a8d370 SHA256 4cf4eb5b26c5199af1332432264f82f920b1728bf150fd8172eec21ca073ff5b
-EBUILD mozilla-sunbird-0.3.1.ebuild 6181 RMD160 ccabbee41c89951b883b58c0b1621efac4248864 SHA1 2f45becd8acb1f34296ce48f10834a88ef9f349c SHA256 b4b011a5daf7a7cdbb3ac9114afff5adabc08a4ea55a5a4e416dc98f74ac89e0
-MD5 f8e66ab185ea372d526e2bcd6c08ecc7 mozilla-sunbird-0.3.1.ebuild 6181
-RMD160 ccabbee41c89951b883b58c0b1621efac4248864 mozilla-sunbird-0.3.1.ebuild 6181
-SHA256 b4b011a5daf7a7cdbb3ac9114afff5adabc08a4ea55a5a4e416dc98f74ac89e0 mozilla-sunbird-0.3.1.ebuild 6181
-MISC ChangeLog 1211 RMD160 d8dc34c883ff647b1b0ca708e2c0935499595789 SHA1 ffbdfcb9d1ba92f64832eb816b01f6821929f42d SHA256 36762d84f2fbb22cc4512b47973ffa6d5d7de700ce3ef1f5af9f07590d25e121
-MD5 62c76fbb9937d703095bc6a49cc4ed18 ChangeLog 1211
-RMD160 d8dc34c883ff647b1b0ca708e2c0935499595789 ChangeLog 1211
-SHA256 36762d84f2fbb22cc4512b47973ffa6d5d7de700ce3ef1f5af9f07590d25e121 ChangeLog 1211
+EBUILD mozilla-sunbird-0.3.1.ebuild 6121 RMD160 40576881582a0f5bd3f62e6264f1a4b0af888546 SHA1 2ef7b45b9514e7b9d78c85c99372c842d0afed8d SHA256 4c8713f633990caf34c75c4139858831c83d305107a16bc8c540aaa7dfe1cb04
+MD5 46457e4d68a2b63f56d3540a6e42f7b2 mozilla-sunbird-0.3.1.ebuild 6121
+RMD160 40576881582a0f5bd3f62e6264f1a4b0af888546 mozilla-sunbird-0.3.1.ebuild 6121
+SHA256 4c8713f633990caf34c75c4139858831c83d305107a16bc8c540aaa7dfe1cb04 mozilla-sunbird-0.3.1.ebuild 6121
+MISC ChangeLog 1398 RMD160 01058218db5a8a503e38d0ea4f5fdf2b84725c6b SHA1 0582dcbc6e144f047f948760bdf1ddaccccb14af SHA256 eefe3fc0fbfa2887941516403420d57ed8fa829e0802c76f783bcc792def4145
+MD5 750a01879a596fbde10b69f8a109f053 ChangeLog 1398
+RMD160 01058218db5a8a503e38d0ea4f5fdf2b84725c6b ChangeLog 1398
+SHA256 eefe3fc0fbfa2887941516403420d57ed8fa829e0802c76f783bcc792def4145 ChangeLog 1398
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata.xml 160
-MD5 6dbb21c281b906269c4d7f0a62281f3a files/digest-mozilla-sunbird-0.3.1 4273
-RMD160 4e56288a37d59094f5c910b8bdd30327d8b6b8f8 files/digest-mozilla-sunbird-0.3.1 4273
-SHA256 1f2002bd68bd333e442bc1716a444411033360fff0d5e426cd0ccba8165fcf11 files/digest-mozilla-sunbird-0.3.1 4273
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF6nQ26J2i8a8J4okRAjKPAKCkKYIP755ED3IX3O/KKMH5s296UQCgkW4z
-SU7ChrJaFyHkF+QUq8eL7V8=
-=XVdS
------END PGP SIGNATURE-----
+MD5 7f88fc8361535a32c08a9cb6f3ae4913 files/digest-mozilla-sunbird-0.3.1 4571
+RMD160 d49549f1fd85da6e4e0ed091d0ebcce11250af29 files/digest-mozilla-sunbird-0.3.1 4571
+SHA256 635b6957ad11496c504a8a9d8066f7772564189e88bbe9c0b168eeb393592746 files/digest-mozilla-sunbird-0.3.1 4571
diff --git a/app-office/mozilla-sunbird/files/digest-mozilla-sunbird-0.3.1 b/app-office/mozilla-sunbird/files/digest-mozilla-sunbird-0.3.1
index c80bc01aef1b..8f124cafd8c9 100644
--- a/app-office/mozilla-sunbird/files/digest-mozilla-sunbird-0.3.1
+++ b/app-office/mozilla-sunbird/files/digest-mozilla-sunbird-0.3.1
@@ -1,3 +1,6 @@
+MD5 179b471c6c4b3291333ea3f9054a5abb mozilla-sunbird-0.3.1-patches-0.1.tar.bz2 7278
+RMD160 9581a3e0e5c4046b66c3c55b9ac0e6450236cc17 mozilla-sunbird-0.3.1-patches-0.1.tar.bz2 7278
+SHA256 17db0a41a69f27314863224ced2ddaf969b25ec8fb1655a1658322cf7c8dcfc2 mozilla-sunbird-0.3.1-patches-0.1.tar.bz2 7278
 MD5 742c4b70cbef579fa99e0409156c0bb3 sunbird-0.3.1.ca.langpack.xpi 97999
 RMD160 6fd1af114e4f07931e6e32d43bc7a9bc330e8ee1 sunbird-0.3.1.ca.langpack.xpi 97999
 SHA256 b84be9cb13e964b5dc1da857df19c78b946f4b4e4b4f8967527582873b9857ae sunbird-0.3.1.ca.langpack.xpi 97999
diff --git a/app-office/mozilla-sunbird/files/mozilla-sunbird-0.3-add-missing-LDFLAGS.patch b/app-office/mozilla-sunbird/files/mozilla-sunbird-0.3-add-missing-LDFLAGS.patch
deleted file mode 100644
index 6452dc829556..000000000000
--- a/app-office/mozilla-sunbird/files/mozilla-sunbird-0.3-add-missing-LDFLAGS.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- layout/build/Makefile.in.orig	2007-02-12 20:42:13.000000000 +0100
-+++ layout/build/Makefile.in	2007-02-12 20:49:48.000000000 +0100
-@@ -291,6 +291,7 @@
- endif
- endif
- 
-+LDFLAGS += -lX11 -lXrender
- 
- export:: $(BUILD_DATE)
- 
diff --git a/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild b/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild
index f7aeb5a373ac..f0d36c3f178c 100644
--- a/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild
+++ b/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild,v 1.4 2007/03/04 07:20:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild,v 1.5 2007/03/07 13:36:01 armin76 Exp $
 
 WANT_AUTOCONF="2.1"
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
 
+PATCH="${P}-patches-0.1"
 LANGS="ca cs da de es-ES eu fr hu it mn nl pl ru sk sl"
 
 MY_PN="${PN/mozilla-}"
@@ -13,13 +14,9 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="The Mozilla Sunbird Calendar"
 HOMEPAGE="http://www.mozilla.org/projects/calendar/sunbird.html"
 IUSE="bindist"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/calendar/${MY_PN}/releases/${PV}/source/${MY_P}.source.tar.bz2"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/calendar/${MY_PN}/releases/${PV}/source/${MY_P}.source.tar.bz2
+	mirror://gentoo/${PATCH}.tar.bz2"
 
-# These are in
-#
-#  http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/${PV}/langpacks/
-#
-# for i in $LANGS $SHORTLANGS; do wget $i.xpi -O ${P}-$i.xpi; done
 for X in ${LANGS} ; do
 	SRC_URI="${SRC_URI}
 		linguas_${X/-/_}? ( http://releases.mozilla.org/pub/mozilla.org/calendar/${MY_PN}/releases/${PV}/langpacks/${MY_PN}-${PV}.${X}.langpack.xpi )"
@@ -82,8 +79,11 @@ src_unpack() {
 		[[ ${X} != "en" ]] && xpi_unpack "${MY_PN}-${PV}.${X}.langpack.xpi"
 	done
 
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.3-add-missing-LDFLAGS.patch"
+	# Apply our patches
+	cd "${S}" || die "cd failed"
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patch
 
 	eautoreconf
 }