Bug 4009 – gaim-0.58-r3.ebuild.diff

• Product: Gentoo Linux
• Status: RESOLVED INVALID

[Description Paul Belt 2002-06-21 22:05:11 UTC]

This MOSTLY adds gaim-e support ... pgp encrypted communication layer.  See
ebuild for the missing part.  And as always... RTFM.  Hey!  It's a start.

--- CUT HERE ---
6c6,9
< DESCRIPTION="Gtk Instant Messenger client"
---
> GAIM_EDIR=${S}/../gaim-e/
> GAIM_EVER='0.9.5'
> 
> DESCRIPTION="gaim-e is an encryption plugin for gaim (Gtk Instant Messenger
client). It uses gnupg (gpg) to securely transfer the session key (RC5). Ideally
it will work for every other communication plugin that gaim uses, but it hasn't
been tested. At the current time the GPG binary is needed"
10a14,16
>
SRC_URI4="http://telia.dl.sourceforge.net/sourceforge/gaim-e/gaim-e.${GAIM_EVER}.tar.gz"
> # SRC_URI5="ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/gpgme-0.3.7.tar.gz"
> 
17a24,25
>     =app-crypt/gpg
>     =app-crypt/gpgme
32c40,41
< 
---
>       unpack gaim-e.0.9.5.tar.gz
> 
36a46,74
>     cd ${S}/../gaim-e/ || die "failed to change into the gaim-e dir"
>       CVSROOT="${S}/../gaim-e/" && \
>          cvs -q up -d || \
>          die "failed to update from cvs"
> 
>       # move gaim-e.tgz files (*.h *.c *.xpm compile) to plugins/
>       mv ${GAIM_EDIR}/*.c \
>          ${GAIM_EDIR}/*.h \
>          ${GAIM_EDIR}/*.xpm \
>        ${GAIM_EDIR}/compile \
>        ${S}/plugins/ || die "error moving gaim-e files"
>              
>       # move gaim-e.tgz doc files to doc/
>       mv ${GAIM_EDIR}/INSTALL \
>          ${GAIM_EDIR}/HOWTO-gaim-e \
>          ${GAIM_EDIR}/TODO-gaim-e \
>       unpack gaim-e.0.9.5.tar.gz
> 
36a46,74
>     cd ${S}/../gaim-e/ || die "failed to change into the gaim-e dir"
>       CVSROOT="${S}/../gaim-e/" && \
>          cvs -q up -d || \
>          die "failed to update from cvs"
> 
>       # move gaim-e.tgz files (*.h *.c *.xpm compile) to plugins/
>       mv ${GAIM_EDIR}/*.c \
>          ${GAIM_EDIR}/*.h \
>          ${GAIM_EDIR}/*.xpm \
>        ${GAIM_EDIR}/compile \
>        ${S}/plugins/ || die "error moving gaim-e files"
>              
>       # move gaim-e.tgz doc files to doc/
>       mv ${GAIM_EDIR}/INSTALL \
>          ${GAIM_EDIR}/HOWTO-gaim-e \
>          ${GAIM_EDIR}/TODO-gaim-e \
>          ${S}/doc/ || die "error moving gaim-e documentation"
> 
>       # Here's a diff that needs to get happen to ${S}/plugins/Makefile
>       #    I don't think a patch is the right solution.
>       #
>       # 153c153
>       # < plugin_DATA = autorecon.so chatlist.so iconaway.so notify.so spellchk.so
>       # ---
>       # > plugin_DATA = autorecon.so chatlist.so iconaway.so notify.so
spellchk.so gaim-e.so
>       # 156c156
>       # < EXTRA_DIST = ChangeLog PERL-HOWTO HOWTO SIGNALS autorecon.c
filectl.c iconaway.c              notify.c spellchk.c gaim.pl mailchk.c chatlist.c
>       # ---
>       # > EXTRA_DIST = ChangeLog PERL-HOWTO HOWTO SIGNALS autorecon.c
filectl.c iconaway.c              notify.c spellchk.c gaim.pl mailchk.c
chatlist.c gaim-e.c
73a112,114
>       cd ${S}/plugins || die "failed to cd into plugin dir"
>       sh ./compile || die "failed to compile gaim-e plugin"
> 

--- end cut ---

[Comment 1 Paul Belt 2002-06-21 22:28:16 UTC]

A better diff than the one listed in the *.ebuild file...
Apply this to plugins/Makefile.am

--- BEGIN CUT ---
14c14
< plugin_DATA = autorecon.so chatlist.so iconaway.so notify.so spellchk.so gaim-e.so
---
> plugin_DATA = autorecon.so chatlist.so iconaway.so notify.so spellchk.so
29c29
<               notify.c spellchk.c gaim.pl mailchk.c chatlist.c gaim-e.so
---
>               notify.c spellchk.c gaim.pl mailchk.c chatlist.c
--- END CUT ---

[Comment 2 Paul Belt 2002-06-21 22:32:09 UTC]

A better CVS update command ... replaces 'cvs -q up -d' in the ebuild

cvs -z3 -d:pserver:[e-mail]:/cvsroot/gift co gaim-e

The line above comes from the current INSTALL file from the cvs update

[Comment 3 Seemant Kulleen (RETIRED) 2002-06-21 23:37:52 UTC]

Paul,

the cvs update within the ebuild is unacceptable.  With a source tree that
changes all the time, the kinds of bugs that _we_ would get would be out of
hand.  If you must use a cvs version, then it is better to take a snapshot which
works and mirror it on our mirrors, if the gaim people do not object.