Rolling back revision bump, CJK patch now in gaim-0.72-r1

5 files changed, 21 insertions, 103 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 7822e7c565a9..61eddbb58a89 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.89 2003/11/12 19:34:12 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.90 2003/11/15 06:35:21 rizzo Exp $
+
+  15 Nov 2003; Don Seiler <rizzo@gentoo.org>; gaim-0.72-r1.ebuild,
+  gaim-0.72-r2.ebuild:
+  Rolling back revision bump. CJK patch now in -r1. Sorry for the inconvenience.
 
 *gaim-0.72-r2 (12 Nov 2003)
 
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 6d5bb8b13420..2ab4ae7bfa3b 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,11 +1,10 @@
 MD5 bed467c3e7077888cf4fd615c5f47678 gaim-0.67.ebuild 2185
-MD5 d1b0d9704741e21d73fffe71adfb4b7e gaim-0.72-r2.ebuild 2878
 MD5 7f89f602fb6fe4954a39c6909cbf3333 gaim-0.71-r2.ebuild 2658
-MD5 4a04b7141773d5909599119a5659e025 gaim-0.72-r1.ebuild 2511
+MD5 a8610bf4a876a30b17c83f8634f01b50 gaim-0.72-r1.ebuild 2878
 MD5 9319539d29d9fb3908789ccf6026d7db gaim-0.66-r3.ebuild 1991
 MD5 9c060fe66488650173c0a493e8744b0a gaim-0.72.ebuild 2508
 MD5 1a9b1940485519f26cffa675c833ca7d gaim-0.70-r2.ebuild 2506
-MD5 450ec2f5975eba3953141b158191f68f ChangeLog 15254
+MD5 760974b8eecbf9a49f6dcff696b709cd ChangeLog 15426
 MD5 dc9ef26d3efea7cbe38cbe534cdeaa53 metadata.xml 510
 MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
 MD5 e6a8773cabdf14d7422e573723258437 files/digest-gaim-0.72 135
@@ -15,7 +14,6 @@ MD5 ac8c28584ee56def0cea65e38e235f0b files/digest-gaim-0.66-r3 126
 MD5 964ed187fa4d6e26816bf39aeb5cd8f1 files/digest-gaim-0.70-r2 135
 MD5 7b98aff453d6189397e4a822c69389f0 files/digest-gaim-0.71-r2 135
 MD5 58f03af2ad906ca7194b3a57c7648cf9 files/digest-gaim-0.72-r1 135
-MD5 58f03af2ad906ca7194b3a57c7648cf9 files/digest-gaim-0.72-r2 135
 MD5 0b625a0ccaa6c9ec3b7cde1b806fa87d files/gaim-0.71-icq-crash-hack.patch 1584
 MD5 97fa7a76f6bc96c363844ccc57b2bec4 files/gaim_gtkimcontext_patch.diff 1106
 MD5 8a38e88937de7dd9b0bd1cd18afd8164 files/gaim-encryption-2.10-keys.patch 476
diff --git a/net-im/gaim/files/digest-gaim-0.72-r2 b/net-im/gaim/files/digest-gaim-0.72-r2
deleted file mode 100644
index bd08cc5b99b3..000000000000
--- a/net-im/gaim/files/digest-gaim-0.72-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2eb9478126ffc76b9a5f3cbf7cd82062 gaim-0.72.tar.bz2 3165345
-MD5 c7cea5b99b2e05f083db77032b0457d5 gaim-encryption-2.17.tar.gz 316928
diff --git a/net-im/gaim/gaim-0.72-r1.ebuild b/net-im/gaim/gaim-0.72-r1.ebuild
index ab208d626f8c..58c0ffedd6c6 100644
--- a/net-im/gaim/gaim-0.72-r1.ebuild
+++ b/net-im/gaim/gaim-0.72-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.72-r1.ebuild,v 1.2 2003/11/04 07:36:21 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.72-r1.ebuild,v 1.3 2003/11/15 06:35:21 rizzo Exp $
 
-IUSE="nls perl spell nas ssl"
+IUSE="nls perl spell nas ssl cjk"
 
 DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://gaim.sourceforge.net/"
@@ -13,7 +13,7 @@ RESTRICT="nomirror"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips"
+KEYWORDS="~x86"
 
 DEPEND="=sys-libs/db-1*
 	>=x11-libs/gtk+-2.0
@@ -29,6 +29,8 @@ DEPEND="=sys-libs/db-1*
 
 src_unpack() {
 	unpack ${A} || die
+	use cjk && epatch ${FILESDIR}/gaim_cjk_gtkconv.patch
+
 	use ssl && {
 		cd ${S}/plugins
 		unpack gaim-encryption-${EV}.tar.gz
@@ -71,6 +73,15 @@ src_install() {
 }
 
 pkg_postinst() {
+	if [ `use cjk` ]; then
+		ewarn
+		ewarn "You have chosen (by selecting 'USE=cjk') to compile with"
+		ewarn "a patch for CJK support.  Please be aware that this patch"
+		ewarn "causes problems with skkinput.  kinput2 works fine.  Details"
+		ewarn "can be found at http://bugs.gentoo.org/show_bug.cgi?id=24657#c23"
+		ewarn
+	fi
+
 	if [ `use ssl` ]; then
 		ewarn
 		ewarn "You have chosen (by selecting 'USE=ssl') to install"
diff --git a/net-im/gaim/gaim-0.72-r2.ebuild b/net-im/gaim/gaim-0.72-r2.ebuild
deleted file mode 100644
index f97c6a5a1b0b..000000000000
--- a/net-im/gaim/gaim-0.72-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.72-r2.ebuild,v 1.1 2003/11/12 19:34:12 rizzo Exp $
-
-IUSE="nls perl spell nas ssl cjk"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-EV=2.17
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
-	ssl? ( mirror://sourceforge/gaim-encryption/gaim-encryption-${EV}.tar.gz )"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND="=sys-libs/db-1*
-	>=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	nas? ( >=media-libs/nas-1.4.1-r1 )
-	sys-devel/gettext
-	media-libs/libao
-	>=media-libs/audiofile-0.2.0
-	perl? ( >=dev-lang/perl-5.6.1
-		>=sys-apps/sed-4.0.0 )
-	dev-libs/nss
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-
-src_unpack() {
-	unpack ${A} || die
-	use cjk && epatch ${FILESDIR}/gaim_cjk_gtkconv.patch
-
-	use ssl && {
-		cd ${S}/plugins
-		unpack gaim-encryption-${EV}.tar.gz
-	}
-}
-
-src_compile() {
-
-	local myconf
-	use perl || myconf="${myconf} --disable-perl"
-	use spell || myconf="${myconf} --disable-gtkspell"
-	use nls  || myconf="${myconf} --disable-nls"
-	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
-	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
-	myconf="${myconf} --with-nss-includes=/usr/include/nss"
-
-	econf ${myconf} || die "Configuration failed"
-	use perl && sed -i -e 's:^\(PERL_MM_PARAMS =.*PREFIX=\)\(.*\):\1'${D}'\2:' plugins/perl/Makefile
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
-
-	use ssl && {
-		local myencconf
-		cd ${S}/plugins/gaim-encryption-${EV}
-
-		myencconf="${myencconf} --with-nspr-includes=/usr/include/nspr"
-		myencconf="${myencconf} --with-nss-includes=/usr/include/nss"
-		econf ${myencconf} || die "Configuration failed for encryption"
-		emake || die "Make failed for encryption"
-	}
-}
-
-src_install() {
-	einstall || die "Install failed"
-	use ssl && {
-		cd ${S}/plugins/gaim-encryption-${EV}
-		einstall || die "Install failed for encryption"
-		cd ${S}
-	}
-	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
-}
-
-pkg_postinst() {
-	if [ `use cjk` ]; then
-		ewarn
-		ewarn "You have chosen (by selecting 'USE=cjk') to compile with"
-		ewarn "a patch for CJK support.  Please be aware that this patch"
-		ewarn "causes problems with skkinput.  kinput2 works fine.  Details"
-		ewarn "can be found at http://bugs.gentoo.org/show_bug.cgi?id=24657#c23"
-		ewarn
-	fi
-
-	if [ `use ssl` ]; then
-		ewarn
-		ewarn "You have chosen (by selecting 'USE=ssl') to install"
-		ewarn "the gaim-encryption plugin ( http://gaim-encryption.sf.net/ )"
-		ewarn "this plugin is NOT supported by the Gaim project, and if you"
-		ewarn "expierence problems related to it, contact the Gentoo project"
-		ewarn "via http://bugs.gentoo.org/ or the gaim-encryption project."
-	fi
-}