Adding branding and help instructions to Help -> About

5 files changed, 196 insertions, 1 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 1c392ba49acc..6a57834db8e4 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,14 @@
 # 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.149 2004/03/22 03:35:02 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.150 2004/03/24 22:56:10 rizzo Exp $
+
+*gaim-0.75-r11 (24 Mar 2004)
+
+  24 Mar 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.75-r11.ebuild,
+  files/gaim-gentoo-branding.patch:
+  Adding some branding in Help -> About. Thanks to Patrick McLean, fixes Bug
+  #45631.  Further directing users to use http://bugs.gentoo.org for help.
+  No need to upgrade.
 
   21 Mar 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.75-r10.ebuild,
   gaim-0.75-r8.ebuild:
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 0d720ba1e274..6c6c04b233bb 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,3 +1,4 @@
+MD5 e15418556776ffea0106cf5e39861fd7 gaim-0.75-r11.ebuild 4338
 MD5 4142d141ee10c2855798920736b8decb gaim-0.75-r10.ebuild 3672
 MD5 3da569050378ca6308fde1a3e2c2e05a ChangeLog 24801
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
@@ -7,7 +8,9 @@ MD5 a714a5babbb4387f5a5516f75548528a files/gaim-0.76cvs-yahoo-misc-fixes-1.diff
 MD5 68525b8389e356a5d05d531b84fb1ada files/gaim-0.74-gnome-url-handler.patch 1854
 MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r8 63
 MD5 a4f3b00a7aa80e7fbc1e315b8c9306c8 files/gaim-0.76cvs-signals-varargs.diff 1753
+MD5 c1c40da376b62090db0d9cf42c1e5c5b files/gaim-gentoo-branding.patch 1944
 MD5 53302cc68bb7bef9803723e977010339 files/gaim-0.74_cjk_gtkconv.patch 1128
 MD5 e58ee6f06747da85a60cb9c13b91f805 files/gaim-0.76cvs-yahoo-login-fix.diff 4618
 MD5 e16439188287325963107a14ccddf668 files/gaim-0.75-yahoo-security.diff 3863
 MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r10 63
+MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r11 63
diff --git a/net-im/gaim/files/digest-gaim-0.75-r11 b/net-im/gaim/files/digest-gaim-0.75-r11
new file mode 100644
index 000000000000..63510235452c
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.75-r11
@@ -0,0 +1 @@
+MD5 9935155985c25dfc9b59183de0da3c30 gaim-0.75.tar.bz2 3370977
diff --git a/net-im/gaim/files/gaim-gentoo-branding.patch b/net-im/gaim/files/gaim-gentoo-branding.patch
new file mode 100644
index 000000000000..a794d5f60ee6
--- /dev/null
+++ b/net-im/gaim/files/gaim-gentoo-branding.patch
@@ -0,0 +1,49 @@
+diff -ur gaim-0.75/configure gaim-0.75-branded/configure
+--- gaim-0.75/configure	2004-03-24 14:12:41.729288968 -0500
++++ gaim-0.75-branded/configure	2004-03-24 14:11:18.347964856 -0500
+@@ -1743,7 +1743,7 @@
+ 
+ # Define the identity of the package.
+  PACKAGE=gaim
+- VERSION=GAIM_VERSION
++ VERSION=GENTOO_EBUILD_VERSION
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+diff -ur gaim-0.75/configure.ac gaim-0.75-branded/configure.ac
+--- gaim-0.75/configure.ac	2004-03-24 14:12:41.730288816 -0500
++++ gaim-0.75-branded/configure.ac	2004-03-24 14:11:18.350964400 -0500
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(src/main.c)
+ AM_CONFIG_HEADER(config.h)
+-AM_INIT_AUTOMAKE([gaim], [GAIM_VERSION])
++AM_INIT_AUTOMAKE([gaim], [GENTOO_EBUILD_VERSION])
+ 
+ AC_PREREQ([2.50])
+ 
+diff -ur gaim-0.75/src/about.c gaim-0.75-branded/src/about.c
+--- gaim-0.75/src/about.c	2004-03-24 14:12:41.675297176 -0500
++++ gaim-0.75-branded/src/about.c	2004-03-24 14:23:09.779810776 -0500
+@@ -97,6 +97,15 @@
+ 				  "Gtk+ and is licensed under the GPL.<BR><BR>"), GTK_IMHTML_NO_SCROLL);
+ 
+ 	gtk_imhtml_append_text(GTK_IMHTML(text),
++			  _("This version of gaim has been modified by the Gentoo "
++				  "developers. If you experience any problems with it, do "
++				  "<B>NOT</B> report them as bugs in the gaim bug tracker, "
++					"and certainly do <B><U>NOT</B></U> seek help in #gaim. "
++					"Report them in the gentoo bugzilla at "
++					"<A HREF=\"http://bugs.gentoo.org\">http://bugs.gentoo.org</A>"
++				  ".<BR><BR>"), GTK_IMHTML_NO_SCROLL);
++
++	gtk_imhtml_append_text(GTK_IMHTML(text),
+ 			"<FONT SIZE=\"3\">URL:</FONT> <A HREF=\"" GAIM_WEBSITE "\">"
+ 			GAIM_WEBSITE "</A><BR><BR>", GTK_IMHTML_NO_SCROLL);
+ 
+diff -ur gaim-0.75/VERSION gaim-0.75-branded/VERSION
+--- gaim-0.75/VERSION	2004-03-24 14:12:41.731288664 -0500
++++ gaim-0.75-branded/VERSION	2004-03-24 14:11:18.351964248 -0500
+@@ -1 +1 @@
+-GAIM_VERSION
++GENTOO_EBUILD_VERSION
diff --git a/net-im/gaim/gaim-0.75-r11.ebuild b/net-im/gaim/gaim-0.75-r11.ebuild
new file mode 100644
index 000000000000..6ce9bab3b3d9
--- /dev/null
+++ b/net-im/gaim/gaim-0.75-r11.ebuild
@@ -0,0 +1,134 @@
+# 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-r11.ebuild,v 1.1 2004/03/24 22:56:10 rizzo Exp $
+
+inherit flag-o-matic eutils gcc
+use debug && inherit debug
+
+IUSE="nls perl spell nas cjk debug crypt gnome"
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://gaim.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~alpha ~ia64 ~mips"
+
+DEPEND=">=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 )
+	spell? ( >=app-text/gtkspell-2.0.2 )
+	|| ( dev-libs/nss net-www/mozilla )
+	gnome? ( >=gnome-base/libgnome-2.4.0 )"
+PDEPEND="crypt? ( net-im/gaim-encryption )"
+
+pkg_setup() {
+	ewarn
+	ewarn "If you experience problems with gaim, file them as bugs with"
+	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
+	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
+	ewarn "seek help in #gaim."
+	ewarn
+	ewarn "Be sure to include a backtrace for any seg faults, see"
+	ewarn "http://gaim.sourceforge.net/gdb.php for details on backtraces."
+	ewarn
+	for TICKER in 1 2 3 4 5; do
+		# Double beep here.
+		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+		echo -ne "\a" ; sleep 1
+	done
+	sleep 8
+}
+
+src_unpack() {
+	unpack ${P}.tar.bz2 || die
+	cd ${S}
+	epatch ${FILESDIR}/gaim-0.75-static-prpls.patch
+	epatch ${FILESDIR}/gaim-0.76cvs-signals-varargs.diff
+	epatch ${FILESDIR}/gaim-0.76cvs-yahoo-login-fix.diff
+	epatch ${FILESDIR}/gaim-0.75-yahoo-security.diff
+	epatch ${FILESDIR}/gaim-0.76cvs-yahoo-misc-fixes-1.diff
+
+	# put in gentoo branding
+	sed "s/GAIM_VERSION/${PV}/; s/GENTOO_EBUILD_VERSION/${PV}-gentoo-${PR%r0}/" \
+		${FILESDIR}/gaim-gentoo-branding.patch \
+		> ${WORKDIR}/gaim-gentoo-branding.patch
+	epatch ${WORKDIR}/gaim-gentoo-branding.patch
+
+	use cjk && epatch ${FILESDIR}/gaim-0.74_cjk_gtkconv.patch
+	use gnome && epatch ${FILESDIR}/gaim-0.74-gnome-url-handler.patch
+}
+
+src_compile() {
+	einfo "Replacing -Os CFLAG with -O2"
+	replace-flags -Os -O2
+
+	# -msse2 doesn't play nice on gcc 3.2
+	[ "`gcc-version`" == "3.2" ] && filter-flags -msse2
+
+	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"
+
+	NSS_LIB=/usr/lib
+	NSS_INC=/usr/include
+	has_version dev-libs/nss && {
+		# 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"
+
+	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+	sed -i -e 's:mkinstalldirs =.*:mkinstalldirs = \$\(MKINSTALLDIRS\):' po/Makefile
+}
+
+src_install() {
+	make install DESTDIR=${D} || 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 - *.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
+
+	ewarn
+	ewarn "If you experience problems with gaim, file them as bugs with"
+	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
+	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
+	ewarn "seek help in #gaim."
+	ewarn
+	ewarn "Be sure to include a backtrace for any seg faults, see"
+	ewarn "http://gaim.sourceforge.net/gdb.php for details on backtraces."
+	ewarn
+	for TICKER in 1 2 3 4 5; do
+		# Double beep here.
+		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+		echo -ne "\a" ; sleep 1
+	done
+	sleep 8
+}