Splitting gaim-encryption plugin into it's own package. Also exporting headers into /usr/include/gaim to accomodate separate plugin packages. Management will be much easier and updates much faster and less intrusive.

4 files changed, 112 insertions, 3 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index c1ebad648863..e20acfbc77a7 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.114 2004/01/12 01:48:15 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.115 2004/01/12 05:33:24 rizzo Exp $
+
+*gaim-0.75-r3 (11 Jan 2004)
+
+  11 Jan 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.75-r3.ebuild:
+  Splitting gaim-encryption plugin into it's own package. Also exporting headers
+  into /usr/include/gaim to accomodate separate plugin packages. Management will
+  be much easier and updates much faster and less intrusive.
+
+  See net-im/gaim-encryption if you want encryption.
 
 *gaim-0.75-r2 (11 Jan 2004)
 
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 69b7281e2aec..16fe4bdc02a8 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -7,9 +7,9 @@ MD5 78be5b331aa107c0ef01b5252eb8c87e gaim-0.72-r1.ebuild 2890
 MD5 cecb719b31af4ea5759fffa397de52be gaim-0.72.ebuild 2508
 MD5 9b0c0eb504517576c7d18406c8c52324 gaim-0.74-r2.ebuild 3858
 MD5 456550d7203f82316e7e598a7655c2fa gaim-0.75-r1.ebuild 3505
-MD5 c957ee7119e0ff1de59edc609e01757d ChangeLog 19149
+MD5 9d8d0a06d721ae1e7cfe0251b5d03209 ChangeLog 19523
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
-MD5 934363f9556401ed296481d1d2599ec5 gaim-0.75-r3.ebuild 2548
+MD5 28cf993e71b8664624b3489aac32c534 gaim-0.75-r3.ebuild 3074
 MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
 MD5 e6a8773cabdf14d7422e573723258437 files/digest-gaim-0.72 135
 MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75 63
diff --git a/net-im/gaim/files/digest-gaim-0.75-r3 b/net-im/gaim/files/digest-gaim-0.75-r3
new file mode 100644
index 000000000000..63510235452c
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.75-r3
@@ -0,0 +1 @@
+MD5 9935155985c25dfc9b59183de0da3c30 gaim-0.75.tar.bz2 3370977
diff --git a/net-im/gaim/gaim-0.75-r3.ebuild b/net-im/gaim/gaim-0.75-r3.ebuild
new file mode 100644
index 000000000000..b7f72eba5cc2
--- /dev/null
+++ b/net-im/gaim/gaim-0.75-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.75-r3.ebuild,v 1.1 2004/01/12 05:33:24 rizzo Exp $
+
+IUSE="nls perl spell nas mozilla cjk debug ssl"
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://gaim.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
+RESTRICT="nomirror"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+
+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 )
+	mozilla? ( net-www/mozilla )
+	!mozilla? ( dev-libs/nss )
+	spell? ( >=app-text/gtkspell-2.0.2 )"
+
+src_unpack() {
+	unpack ${P}.tar.bz2 || die
+	cd ${S}
+	use cjk && epatch ${FILESDIR}/gaim-0.74_cjk_gtkconv.patch
+}
+
+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"
+	use debug  && myconf="${myconf} --enable-debug"
+
+	NSS_LIB=/usr/lib
+	NSS_INC=/usr/include
+	use mozilla || {
+		# Only need to specify this if no pkgconfig from mozilla
+		myconf="${myconf} --with-nspr-includes=${NSS_INC}/nspr"
+		myconf="${myconf} --with-nss-includes=${NSS_INC}/nss"
+		myconf="${myconf} --with-nspr-libs=${NSS_LIB}"
+		myconf="${myconf} --with-nss-libs=${NSS_LIB}"
+	}
+
+	econf ${myconf} || die "Configuration failed"
+	use perl && sed -i -e 's:^\(PERL_MM_PARAMS =.*PREFIX=\)\(.*\):\1'${D}'\2:' plugins/perl/Makefile
+
+	einfo "Replacing -Os CFLAG with -O2"
+	replace-flags -Os -O2
+
+	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+}
+
+src_install() {
+	einstall || die "Install failed"
+	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
+
+	# Copy header files for gaim plugin use
+	dodir /usr/include/gaim/src
+	cp config.h ${D}/usr/include/gaim/
+	cd ${S}/src
+	#tar cf - `find . -name \*.h` | (cd ${D}/usr/include/gaim/src ; tar xvf -)
+	tar cf - *.h | (cd ${D}/usr/include/gaim/src ; tar xvf -)
+	assert "Failed to install header files to /usr/include/gaim"
+}
+
+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
+		einfo
+		einfo "The gaim-encryption package is now it's own package in portage"
+		einfo "To install it run:"
+		einfo
+		einfo "emerge gaim-encryption"
+		einfo
+		einfo "All of your existing gaim-encryption settings are still"
+		einfo "in place and will be recognized when gaim-encryption is"
+		einfo "installed.  You may need to re-enable gaim-encryption in"
+		einfo "your gaim preferences."
+		einfo
+	fi
+}