Apply upstream patch to allow building against GAIM 2 beta releases as suggested by Joshua Schmidlkofer <menion@asylumwear.com> in bug #127240.

Package-Manager: portage-2.1

5 files changed, 115 insertions, 8 deletions

diff --git a/x11-plugins/gaim-otr/ChangeLog b/x11-plugins/gaim-otr/ChangeLog
index 9d75290b388d..8d5fe1ce88e8 100644
--- a/x11-plugins/gaim-otr/ChangeLog
+++ b/x11-plugins/gaim-otr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/gaim-otr
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/ChangeLog,v 1.12 2005/11/14 06:12:04 rizzo Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/ChangeLog,v 1.13 2006/06/14 13:04:16 chainsaw Exp $
+
+*gaim-otr-3.0.0-r1 (14 Jun 2006)
+
+  14 Jun 2006; Tony Vroon <chainsaw@gentoo.org> +gaim-otr-3.0.0-r1.ebuild:
+  Apply upstream patch to allow building against GAIM 2 beta releases as
+  suggested by Joshua Schmidlkofer <menion@asylumwear.com> in bug #127240.
 
 *gaim-otr-3.0.0 (14 Nov 2005)
 
diff --git a/x11-plugins/gaim-otr/Manifest b/x11-plugins/gaim-otr/Manifest
index f6e8d9cff580..3041dd944366 100644
--- a/x11-plugins/gaim-otr/Manifest
+++ b/x11-plugins/gaim-otr/Manifest
@@ -1,13 +1,70 @@
-MD5 d6a0a49c17ecce9bc0c306bdfbd9bcbf ChangeLog 1901
-MD5 a574ec2607edf5e80117d65415e01d3c metadata.xml 159
-MD5 5ceb703114e1498905dbf5df52556c3e gaim-otr-2.0.0.ebuild 752
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gaim-otr-1.0.3-fPIC.patch 364 RMD160 6bd524e20cb2aa5bd36e077dcab4134d9aad8fe9 SHA1 e1d2eeaed4c346af63f7af0e8b7fa75ca839631b SHA256 c04f4a9416f3623728aa9fb4bb0a01fa269fef8ac5a26b28d14ee247ba7c26fd
+MD5 f35f82a092a303af1e9780ec9fd495fa files/gaim-otr-1.0.3-fPIC.patch 364
+RMD160 6bd524e20cb2aa5bd36e077dcab4134d9aad8fe9 files/gaim-otr-1.0.3-fPIC.patch 364
+SHA256 c04f4a9416f3623728aa9fb4bb0a01fa269fef8ac5a26b28d14ee247ba7c26fd files/gaim-otr-1.0.3-fPIC.patch 364
+DIST gaim-otr-1.0.3.tar.gz 18762
+DIST gaim-otr-2.0.0.tar.gz 34142
+DIST gaim-otr-2.0.1.tar.gz 34691
+DIST gaim-otr-2.0.2.tar.gz 314346
+DIST gaim-otr-3.0.0.tar.gz 326217 RMD160 7b550b2be1bd150a48ae697fdea3efb1f1677747 SHA1 99eb9e056f5163d29d33a7d66517f53d7a7433e5 SHA256 d6887fe5054bba466d15d1436ed15982a3b8ef1dbb8e73eeb79195535f88be01
+DIST gaim2b2-otr.diff 9133 RMD160 1eb6dde0312720d043a36eb17ff93637a63e7972 SHA1 f1f0e070cc67da9e95725c782683444456db2d3c SHA256 7d2f9605b4d0cb90c447698f2ee4b52f059c49f9136ae973b9696e87af57f5b9
+EBUILD gaim-otr-1.0.3.ebuild 848 RMD160 a98e4034bfbc9fd602dc5ac57a5e2f25a71ee9fc SHA1 1e5657047a91781ccd115079a28a0161216f0455 SHA256 f2918ed32ea66ae10968a33cc4c7e0791a775bb7f315a3d082372820e24040b1
 MD5 60891b4da42ffa5dbe9310786063c166 gaim-otr-1.0.3.ebuild 848
+RMD160 a98e4034bfbc9fd602dc5ac57a5e2f25a71ee9fc gaim-otr-1.0.3.ebuild 848
+SHA256 f2918ed32ea66ae10968a33cc4c7e0791a775bb7f315a3d082372820e24040b1 gaim-otr-1.0.3.ebuild 848
+EBUILD gaim-otr-2.0.0.ebuild 752 RMD160 5e52721e82db0b4535bca118683dfa9ee8857e34 SHA1 46bfd2455952ea3b12737d2efe46cfb27d723a50 SHA256 63d1e100a8b623ad2b4f4f164ca5384bd72ff95e69a8ce72a72f5c320a5c5a68
+MD5 5ceb703114e1498905dbf5df52556c3e gaim-otr-2.0.0.ebuild 752
+RMD160 5e52721e82db0b4535bca118683dfa9ee8857e34 gaim-otr-2.0.0.ebuild 752
+SHA256 63d1e100a8b623ad2b4f4f164ca5384bd72ff95e69a8ce72a72f5c320a5c5a68 gaim-otr-2.0.0.ebuild 752
+EBUILD gaim-otr-2.0.1.ebuild 756 RMD160 7f89ff5191bf1880427c3b7b8dc443fd1f957aa0 SHA1 4586cf7d28b76b560c135dba09f62da48908136d SHA256 d4c5b1e26448b22e714c03e3ab1dcbf4f150b43c39680c2b391d19a832d5fa78
 MD5 d89410fb22b224bb4fb16a0508a0f3b4 gaim-otr-2.0.1.ebuild 756
+RMD160 7f89ff5191bf1880427c3b7b8dc443fd1f957aa0 gaim-otr-2.0.1.ebuild 756
+SHA256 d4c5b1e26448b22e714c03e3ab1dcbf4f150b43c39680c2b391d19a832d5fa78 gaim-otr-2.0.1.ebuild 756
+EBUILD gaim-otr-2.0.2.ebuild 791 RMD160 9d2e8a8b87364c57fa3bc92203b9c5f66b1d751f SHA1 5a4336acd8a027cae081051f9eae7f16750db768 SHA256 5a626b619f943660b3b4da8a349c80848f5c0e4084be960fec3939898814243b
 MD5 8c4e72f45cdc3e3f0cdd1a88ee80c400 gaim-otr-2.0.2.ebuild 791
+RMD160 9d2e8a8b87364c57fa3bc92203b9c5f66b1d751f gaim-otr-2.0.2.ebuild 791
+SHA256 5a626b619f943660b3b4da8a349c80848f5c0e4084be960fec3939898814243b gaim-otr-2.0.2.ebuild 791
+EBUILD gaim-otr-3.0.0-r1.ebuild 919 RMD160 47ccee89177b33edc294c3d56df2a436d2c894fb SHA1 a22d9c07b70bfd9d6f4c1bed49459b3d2356a339 SHA256 d83fea7cf0d506a32f2f8e0b6a67e48efafdf598284858f86c9510087e2edb03
+MD5 3f5b2136089a3d417b7a50604e20da1a gaim-otr-3.0.0-r1.ebuild 919
+RMD160 47ccee89177b33edc294c3d56df2a436d2c894fb gaim-otr-3.0.0-r1.ebuild 919
+SHA256 d83fea7cf0d506a32f2f8e0b6a67e48efafdf598284858f86c9510087e2edb03 gaim-otr-3.0.0-r1.ebuild 919
+EBUILD gaim-otr-3.0.0.ebuild 790 RMD160 fc36299f053aa2731c975041c8ef2c6fe64bade4 SHA1 7a2d99ef0dd705ea04d08dbaa4d4acd33950dc17 SHA256 815d5cb2311822a3c8cae36ab9f9b3740513ec10ce1211e948d3c80d9951eb11
 MD5 4678d2c9bf1edc755d264a4a78d6955d gaim-otr-3.0.0.ebuild 790
+RMD160 fc36299f053aa2731c975041c8ef2c6fe64bade4 gaim-otr-3.0.0.ebuild 790
+SHA256 815d5cb2311822a3c8cae36ab9f9b3740513ec10ce1211e948d3c80d9951eb11 gaim-otr-3.0.0.ebuild 790
+MISC ChangeLog 2162 RMD160 c7f95808ebbd65e00f61e7f279f99d274a2b4a5f SHA1 7b4a7f0dba1dd83f5ec04fb1bfafca334c4cd849 SHA256 8ff37f9936402a22affea0935b8877544fe0a6ca2756d71b83e9c062ba87cb3a
+MD5 99b70262be68b418d02ee0f86b6937fe ChangeLog 2162
+RMD160 c7f95808ebbd65e00f61e7f279f99d274a2b4a5f ChangeLog 2162
+SHA256 8ff37f9936402a22affea0935b8877544fe0a6ca2756d71b83e9c062ba87cb3a ChangeLog 2162
+MISC metadata.xml 159 RMD160 3e0df024f9705f0cd1798f45cd4b0698e183ee87 SHA1 08e27d5a696205dc5c9992d4f3b647cd609ec139 SHA256 bb3130d2515d5b2e4ff19aff2199bb00ac7c350bf78b34bbec55268bf1013908
+MD5 a574ec2607edf5e80117d65415e01d3c metadata.xml 159
+RMD160 3e0df024f9705f0cd1798f45cd4b0698e183ee87 metadata.xml 159
+SHA256 bb3130d2515d5b2e4ff19aff2199bb00ac7c350bf78b34bbec55268bf1013908 metadata.xml 159
+MD5 25b670ffc82acacbee5777a73c30c608 files/digest-gaim-otr-1.0.3 65
+RMD160 f3ccd63ec7d83f7094dbd756901b9e870eb0d2cf files/digest-gaim-otr-1.0.3 65
+SHA256 4f584c9c69c4f2d0990465dcc784144c67d750297289cc44fbd811ab6883fb7a files/digest-gaim-otr-1.0.3 65
 MD5 972e2f6cda3a9c79b1de8cbd95549597 files/digest-gaim-otr-2.0.0 65
+RMD160 189a9f9489d143b44081e5c807975d435958a5ac files/digest-gaim-otr-2.0.0 65
+SHA256 73c6bc451529c4075b26058979ea10315611e1a65535b9861bd9a9f75a8c314c files/digest-gaim-otr-2.0.0 65
 MD5 92722fbea66bd224305cdbdb38a2caa5 files/digest-gaim-otr-2.0.1 65
-MD5 25b670ffc82acacbee5777a73c30c608 files/digest-gaim-otr-1.0.3 65
-MD5 f35f82a092a303af1e9780ec9fd495fa files/gaim-otr-1.0.3-fPIC.patch 364
+RMD160 0665c7c7b8c00b9b55ab40a5f27fa8695662bb6b files/digest-gaim-otr-2.0.1 65
+SHA256 a5b5d300c05f0fd95d56665fc0bc7a60401b71a77630cb7596650773fcb5cb6d files/digest-gaim-otr-2.0.1 65
 MD5 84d74457f9d086a1dcf107227314474c files/digest-gaim-otr-2.0.2 66
-MD5 a0bdb06dbcd01bf190eb4e3caa0ec1ec files/digest-gaim-otr-3.0.0 66
+RMD160 c109bc091c1385a8adb3b9c5e48e61184a8a4cac files/digest-gaim-otr-2.0.2 66
+SHA256 13438c4b0d45f0ab88e0af7425b8c7c0cbc6150fcf0f2e84e37fece0dca99a82 files/digest-gaim-otr-2.0.2 66
+MD5 bcdc4a1ace21bad682b070937a24e9ce files/digest-gaim-otr-3.0.0 244
+RMD160 229b961cb347f89f4b51748d6da6233dea31ca9b files/digest-gaim-otr-3.0.0 244
+SHA256 742bd2b768d5f9b70d4a9765666d1e5483b8367bf76d373e552c55b588d987c9 files/digest-gaim-otr-3.0.0 244
+MD5 a8927832a3241b942e253e2e925c6854 files/digest-gaim-otr-3.0.0-r1 467
+RMD160 e969e9f2683dd0702dd10f50085356c5d7a8f764 files/digest-gaim-otr-3.0.0-r1 467
+SHA256 1a2656209edd2e117253f5f2f7377dfb823d2d9497263c8406a64155898473e1 files/digest-gaim-otr-3.0.0-r1 467
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEkAlQp5vW4rUFj5oRAnLDAKCCJmaw+ocUhGtRWidoo3iscHG8MQCgrWaX
+gLyNtw7ZgeVXb++ibRUVE+g=
+=OdHV
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/gaim-otr/files/digest-gaim-otr-3.0.0 b/x11-plugins/gaim-otr/files/digest-gaim-otr-3.0.0
index adb92d857a75..c0fcf5ac764c 100644
--- a/x11-plugins/gaim-otr/files/digest-gaim-otr-3.0.0
+++ b/x11-plugins/gaim-otr/files/digest-gaim-otr-3.0.0
@@ -1 +1,3 @@
 MD5 e819ef065bc0758f58beae5aa6a73ab1 gaim-otr-3.0.0.tar.gz 326217
+RMD160 7b550b2be1bd150a48ae697fdea3efb1f1677747 gaim-otr-3.0.0.tar.gz 326217
+SHA256 d6887fe5054bba466d15d1436ed15982a3b8ef1dbb8e73eeb79195535f88be01 gaim-otr-3.0.0.tar.gz 326217
diff --git a/x11-plugins/gaim-otr/files/digest-gaim-otr-3.0.0-r1 b/x11-plugins/gaim-otr/files/digest-gaim-otr-3.0.0-r1
new file mode 100644
index 000000000000..26f4d27261ac
--- /dev/null
+++ b/x11-plugins/gaim-otr/files/digest-gaim-otr-3.0.0-r1
@@ -0,0 +1,6 @@
+MD5 e819ef065bc0758f58beae5aa6a73ab1 gaim-otr-3.0.0.tar.gz 326217
+RMD160 7b550b2be1bd150a48ae697fdea3efb1f1677747 gaim-otr-3.0.0.tar.gz 326217
+SHA256 d6887fe5054bba466d15d1436ed15982a3b8ef1dbb8e73eeb79195535f88be01 gaim-otr-3.0.0.tar.gz 326217
+MD5 7a255b5dad10066452cf7083cc99f215 gaim2b2-otr.diff 9133
+RMD160 1eb6dde0312720d043a36eb17ff93637a63e7972 gaim2b2-otr.diff 9133
+SHA256 7d2f9605b4d0cb90c447698f2ee4b52f059c49f9136ae973b9696e87af57f5b9 gaim2b2-otr.diff 9133
diff --git a/x11-plugins/gaim-otr/gaim-otr-3.0.0-r1.ebuild b/x11-plugins/gaim-otr/gaim-otr-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..7cbf59ab3884
--- /dev/null
+++ b/x11-plugins/gaim-otr/gaim-otr-3.0.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-otr/gaim-otr-3.0.0-r1.ebuild,v 1.1 2006/06/14 13:04:16 chainsaw Exp $
+
+inherit flag-o-matic eutils debug
+
+DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
+HOMEPAGE="http://www.cypherpunks.ca/otr/"
+SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz http://www.cypherpunks.ca/otr/gaim2b2-otr.diff"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=net-libs/libotr-3.0.0
+	>=net-im/gaim-1.5.0"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${DISTDIR}/gaim2b2-otr.diff
+}
+
+src_compile() {
+	strip-flags
+	replace-flags -O? -O2
+
+	econf || die "econf failed"
+	emake -j1 || die "Make failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "Install failed"
+	dodoc COPYING ChangeLog README
+}