summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-im/ekg2/ChangeLog7
-rw-r--r--net-im/ekg2/Manifest12
-rw-r--r--net-im/ekg2/ekg2-9999.ebuild236
-rw-r--r--net-im/ekg2/metadata.xml19
4 files changed, 89 insertions, 185 deletions
diff --git a/net-im/ekg2/ChangeLog b/net-im/ekg2/ChangeLog
index 10492494b5b0..ea093c5c438f 100644
--- a/net-im/ekg2/ChangeLog
+++ b/net-im/ekg2/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-im/ekg2
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ChangeLog,v 1.35 2010/10/25 00:24:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ChangeLog,v 1.36 2010/12/17 20:08:36 mgorny Exp $
+
+ 17 Dec 2010; Michał Górny <mgorny@gentoo.org> ekg2-9999.ebuild,
+ metadata.xml:
+ Sync the live ebuild with the mgorny repo. This means switching it into the
+ new git repo and switching it back to the original autotools build system.
25 Oct 2010; Christian Faulhammer <fauli@gentoo.org>
ekg2-0.3_pre20101008.ebuild:
diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest
index b6064b588c3c..39c78b182efc 100644
--- a/net-im/ekg2/Manifest
+++ b/net-im/ekg2/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
AUX 0001-Drop-duplicate-config_audio_device-declaration-it-wa.patch 1155 RMD160 b2874efdfb3965dc7961f51d9cf498ea5b62f964 SHA1 9358908b9fcc20573b0d0edd8d0a5740665f71c9 SHA256 a3c596d740cbe82744b37373f7df9df7c95b81ae090aade60df8f5ecac70e272
DIST ekg2-0.3_pre20101008.tar.bz2 915719 RMD160 828491ab3c3026cfa3a021ad5858fc0dc68e0b3d SHA1 0971d76185aa0e6f6f73c534d61103d39257ff9b SHA256 acf4a176e2a68c22f7092492812fb3f28ffaf2b81b1eff848e5032226734be2c
EBUILD ekg2-0.3_pre20101008.ebuild 5894 RMD160 2c8098fc6835fb48cadf3990a24b967c0870fedd SHA1 58a24e5ff8331b9583c4b10efcd7e1c510a6d917 SHA256 9335c1379d4205efb44b453f3d6ed3f40b2f886ab3a67ca242a166999b3ac281
-EBUILD ekg2-9999.ebuild 5845 RMD160 42037c33331663a691519a0dbe901b9833654bd1 SHA1 4c76319f0bb484dceba8cbd878e321095fa4555a SHA256 d06a801f390fc5b78b35df860045edca97e85add1a7dda525be1eeb91783e8b8
-MISC ChangeLog 1105 RMD160 6dd71e8e08c9722cc490992b19a4991e4b95512e SHA1 b004f1637249f6a9bb94b82c7f19da5fa430c9f6 SHA256 1a68136dd8b68a3803b8a1662b9b2b329539667031026a7f51e43afd3b5cde6b
-MISC metadata.xml 2502 RMD160 4ce3d9d0f6e73ac7642095537f8d8a7e5ebb594d SHA1 d0ceffd8497bd97671b39ba3ea47c894301b20d4 SHA256 9599f31b7d4d7878dce3565b1cc8c4a2b178ca4cb31926555204cedd2fb2edaf
+EBUILD ekg2-9999.ebuild 2854 RMD160 89f01978811d3ff97bc0dd69fd07f40866c60752 SHA1 ee0860b4493eb2991e8e6467141244ac5ed75f1c SHA256 f23318de9f9398fff57f034ab320eb9bde7d3203a2bb0f2f1658d3e983ba9872
+MISC ChangeLog 1346 RMD160 c67a5047226a6bdef7a8d436e56d7fc0387c06f9 SHA1 9d5880e78bcdd2d60276e03df95d9218deaf1356 SHA256 bc028fa0cfb6cf98a0b0540f5836f6529ae6ca5a632eedb9b28b975a6eedd18e
+MISC metadata.xml 3121 RMD160 6403462aa024aeef482db0f6e8314fd25469dbe5 SHA1 08ee6cc06bf940cca5af6fe671af1850ecebe188 SHA256 21c4416789b03304e2152801c700da0e42a8737f3a14d4d7fd8a8efb852fbc51
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkzEzskACgkQNQqtfCuFneO4lQCghAlvWR5uDKhkDcO7lSGO2NUz
-lPYAnRPVpUlXU5x1saI+HV9MzjNeowBv
-=fcdl
+iEYEARECAAYFAk0LwqwACgkQnGSe5QXeB7upewCeOHr2uV6dDDVPn9nH5h+dxmtV
+a60AoI+uqE1KLsUeRzhNf6QNqeikYZ2+
+=h9Zi
-----END PGP SIGNATURE-----
diff --git a/net-im/ekg2/ekg2-9999.ebuild b/net-im/ekg2/ekg2-9999.ebuild
index 714cc8853ddd..dc41a2e3db2a 100644
--- a/net-im/ekg2/ekg2-9999.ebuild
+++ b/net-im/ekg2/ekg2-9999.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-9999.ebuild,v 1.1 2010/10/08 13:53:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-9999.ebuild,v 1.2 2010/12/17 20:08:36 mgorny Exp $
EAPI=2
-ESVN_REPO_URI="http://toxygen.net/svn/ekg2/trunk"
+EGIT_REPO_URI="git://github.com/leafnode/ekg2.git"
-inherit multilib perl-module scons-utils subversion toolchain-funcs
+inherit autotools autotools-utils git
DESCRIPTION="Text-based, multi-protocol instant messenger"
HOMEPAGE="http://www.ekg2.org"
@@ -14,43 +14,29 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="dbus extra gadu gif gnutls gpg gpm gsm gtk icq idn inotify irc
- jabber jogger jpeg mail minimal ncurses nls nntp oracle oss pcap
- perl python readline remote rss ruby sim sms spell
- sqlite sqlite3 srv ssl static unicode web xosd zlib"
-
-# -- non-obvious plugin mappings --
-# extra -> autoresponder, polchat, rivchat, rot13, xmsg
-# !minimal -> ioctld, logs, rc
-# any sound -> pcm
-# web -> httprc_xajax
+IUSE="expat gadu gif gnutls gpg gpm gsm gtk idn inotify jpeg ncurses nls
+ oracle perl python readline spell sqlite sqlite3 ssl threads unicode
+ xosd zlib"
RDEPEND="
- dbus? ( sys-apps/dbus )
gpg? ( app-crypt/gpgme )
gsm? ( media-sound/gsm )
gtk? ( x11-libs/gtk+:2 )
idn? ( net-dns/libidn )
nls? ( virtual/libintl )
oracle? ( dev-db/oracle-instantclient-basic )
- pcap? ( net-libs/libpcap )
perl? ( dev-lang/perl )
python? ( dev-lang/python )
readline? ( sys-libs/readline )
- rss? ( dev-libs/expat )
- ruby? ( dev-lang/ruby )
- sim? ( dev-libs/openssl )
+ ssl? ( dev-libs/openssl )
xosd? ( x11-libs/xosd )
+ zlib? ( sys-libs/zlib )
+
gadu? ( net-libs/libgadu
gif? ( media-libs/giflib )
jpeg? ( media-libs/jpeg ) )
- irc? ( ssl? ( dev-libs/openssl ) )
- jabber? ( dev-libs/expat
- gnutls? ( net-libs/gnutls )
- !gnutls? ( ssl? ( dev-libs/openssl ) )
- zlib? ( sys-libs/zlib ) )
- !minimal? (
- zlib? ( sys-libs/zlib ) )
+ expat? ( dev-libs/expat
+ gnutls? ( net-libs/gnutls ) )
ncurses? ( sys-libs/ncurses[unicode?]
gpm? ( sys-libs/gpm )
spell? ( app-text/aspell ) )
@@ -60,163 +46,65 @@ RDEPEND="
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
+DOCS=(
+ AUTHORS README.md docs/README docs/TODO
+ docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt
+ docs/themes.txt docs/themes-en.txt
+ docs/ui-ncurses.txt docs/ui-ncurses-en.txt
+)
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
pkg_setup() {
- if ! use gtk && ! use ncurses && ! use readline && ! use remote && ! use web; then
+ if ! use gtk && ! use ncurses && ! use readline; then
ewarn 'ekg2 is being compiled without any frontend, you should consider'
ewarn 'enabling at least one of following USEflags:'
- ewarn ' gtk, ncurses, readline, remote, web.'
+ ewarn ' gtk, ncurses, readline.'
fi
-}
-
-use_plug() {
- use ${1} && echo -n ,${2:-${1}}
-}
-
-# Build comma-separated plugin list based on USE
-# We can put the same plugin few times if it's referenced by more than one flag
-
-build_plugin_list() {
- echo '@none' \
- $(use_plug dbus) \
- $(use_plug extra autoresponder,polchat,rivchat,rot13,xmsg) \
- $(use_plug gadu gg) \
- $(use_plug gpg) \
- $(use_plug gsm) \
- $(use_plug gtk) \
- $(use_plug icq) \
- $(use_plug irc) \
- $(use_plug jabber jabber) \
- $(use_plug jogger jogger) \
- $(use_plug mail) \
- $(use_plug !minimal ioctld,logs,rc) \
- $(use_plug ncurses) \
- $(use_plug nntp feed) \
- $(use_plug oracle logsoracle) \
- $(use_plug oss oss,pcm) \
- $(use_plug pcap sniff) \
- $(use_plug perl) \
- $(use_plug python) \
- $(use_plug readline) \
- $(use_plug remote) \
- $(use_plug rss feed) \
- $(use_plug ruby) \
- $(use_plug sim) \
- $(use_plug sms) \
- $(use_plug sqlite logsqlite) \
- $(use_plug sqlite3 logsqlite) \
- $(use_plug web httprc_xajax) \
- $(use_plug xosd) \
- | tr -d '[[:space:]]'
-}
-
-# create DEPS list for plugin
-# + means dep forced (fail if unavailable, prioritize over other one-of)
-# - means dep disabled (don't even check for it)
-# use:opt maps USEflag to specified opt
-# usea|useb|usec makes one-of opt
-
-make_deps() {
- local spls spll flag fopt out
-
- echo -n " ${1}_DEPS="
- shift
-
- # loop over different opts
- while [[ -n ${1} ]]; do
- spls=${1}
- out=
- # loop over one-of opts
- while true; do
- # get next one-of, make sure spls gets empty if last
- spll=${spls%%|*}
- spls=${spls:$(( ${#spll} + 1 ))}
- # parse use:opt, if no :opt specified fopt=flag
- flag=${spll%:*}
- fopt=${spll#*:}
-
- # if one of one-of opt matches, we output only it
- # else we need to output all of them disabled
- use ${flag} && out=+ || out=${out}-
- out=${out}${fopt}
-
- # got more one-of opts? parse them only if this didn't match
- if [[ -n ${spls} ]] && ! use ${flag}; then
- out=${out},
- continue
- fi
-
- echo -n ${out}
- shift
- [[ -n ${1} ]] && echo -n ,
- break
- done
- done
-}
-# create all DEPS lists
-
-build_addopts_list() {
- use extra && make_deps XMSG inotify
- use gadu && make_deps GG gif jpeg
- use irc && make_deps IRC 'ssl:openssl'
- use jabber && make_deps JABBER zlib 'gnutls|ssl:openssl'
- use mail && make_deps MAIL inotify
- use !minimal && make_deps LOGS zlib
- use ncurses && make_deps NCURSES gpm spell:aspell
- use rss || use nntp && make_deps FEED rss:expat
- use sqlite3 || use sqlite && make_deps LOGSQLITE 'sqlite3|sqlite'
-}
-
-# SCons doesn't build perl modules, perl-module.eclass does it better
-
-foreach_perl_module() {
- if use perl; then
- local d
- for d in "${S}"/plugins/perl/*/; do
- cd "${d}" || die
- ${1}
-
- # workaround perl-module.eclass
- unset SRC_PREP
- done
+ if use gnutls && ! use ssl; then
+ ewarn 'You have enabled USE=gnutls without USE=ssl. The SSL support'
+ ewarn 'in ekg2 will be limited to the plugins supporting GnuTLS.'
fi
}
-src_configure() {
- # HARDDEPS -> build should fail if some dep is unsatisfied
- # DISTNOTES -> are displayed with /version, helpful for upstream bug reports
-
- tc-export CC
- escons PLUGINS=$(build_plugin_list) $(build_addopts_list) \
- HARDDEPS=1 SKIPCHECKS=1 RELPLUGINS=0 \
- $(use_scons unicode UNICODE) $(use_scons nls NLS) \
- $(use_scons static STATIC) $(use_scons idn IDN) \
- $(use_scons srv RESOLV) \
- PREFIX=/usr LIBDIR="\$EPREFIX/$(get_libdir)" \
- DOCDIR="\$DATAROOTDIR/doc/${PF}" \
- DISTNOTES="Gentoo ebuild ${PVR}, USE='${USE}'" \
- ${MAKEOPTS} conf || die "escons conf failed"
-
- foreach_perl_module perl-module_src_configure
+src_prepare() {
+ autotools-utils_src_prepare
+ eautoreconf
+ eautopoint
+ # Ugly and gives too many files but should work.
+ find -name '*.c' | sort > po/POTFILES.in
}
-src_compile() {
- # SKIPCONF -> no need to reconfigure
-
- escons SKIPCONF=1 ${MAKEOPTS} || die
-
- foreach_perl_module perl-module_src_compile
-}
-
-src_test() {
- foreach_perl_module perl-module_src_test
-}
-
-src_install() {
- escons DESTDIR="${D}" ${MAKEOPTS} install || die
-
- foreach_perl_module perl-module_src_install
-
- # XXX: replace it when an alternative is available
- prepalldocs
+src_configure() {
+ myeconfargs=(
+ $(use_with expat)
+ $(use_with gadu libgadu)
+ $(use_with gif)
+ $(use_with gnutls libgnutls)
+ $(use_with gpg)
+ $(use_with gpm gpm-mouse)
+ $(use_with gsm libgsm)
+ $(use_with gtk)
+ $(use_with idn libidn)
+ $(use_with inotify)
+ $(use_with jpeg libjpeg)
+ $(use_with ncurses)
+ $(use_with oracle logsoracle)
+ $(use_with perl)
+ $(use_with python)
+ $(use_with readline)
+ $(use_with spell aspell)
+ $(use_with sqlite)
+ $(use_with sqlite3)
+ $(use_with ssl openssl)
+ $(use_with threads pthread)
+ $(use_with xosd libxosd)
+ $(use_with zlib)
+ $(use_enable nls)
+ $(use_enable unicode)
+ --without-ioctld
+ --disable-remote
+ --enable-skip-relative-plugins-dir
+ )
+ autotools-utils_src_configure
}
diff --git a/net-im/ekg2/metadata.xml b/net-im/ekg2/metadata.xml
index ad18a7895317..30e137880b50 100644
--- a/net-im/ekg2/metadata.xml
+++ b/net-im/ekg2/metadata.xml
@@ -8,13 +8,20 @@
</maintainer>
<use>
+ <flag name='expat'>Enable plugins relying on <pkg>dev-libs/expat</pkg>
+ (jabber &amp; feed plugins).</flag>
<flag name='extra'>Enable following plugins: autoresponder,
polchat, rivchat, rot13, xmsg.</flag>
<flag name='gadu'>Enable Gadu-Gadu protocol support (requires
<pkg>net-libs/libgadu</pkg>).</flag>
<flag name='gif'>GIF token support for Gadu-Gadu protocol.</flag>
- <flag name='gnutls'>Enable SSL/TLS support through GnuTLS (for jabber
- plugin). If 'ssl' is set too, GnuTLS will be used.</flag>
+ <flag name='gnutls' restrict='&lt;net-im/ekg2-0.3.0_rc'>Enable SSL/TLS
+ support through GnuTLS for the plugins supporting it. If 'ssl'
+ is enabled too, GnuTLS will be preferred where possible (and
+ OpenSSL will be used elsewhere).</flag>
+ <flag name='gnutls' restrict='&gt;=net-im/ekg2-0.3.0_rc'>Enable SSL/TLS
+ support through GnuTLS (for jabber plugin). If 'ssl' is set too,
+ GnuTLS will be used.</flag>
<flag name='gpg'>Enable jabber message encryption through
<pkg>app-crypt/gpgme</pkg>.</flag>
<flag name='inotify'>Enable inotify-based filesystem moniotoring support
@@ -40,8 +47,12 @@
<flag name='sqlite'>Support logging messages into SQLite2 database.
If 'sqlite3' is set too, it will be used instead.</flag>
<flag name='srv'>Use SRV-capable resolver through libresolv.</flag>
- <flag name='ssl'>Enable SSL/TLS support through OpenSSL (for jabber
- plugin). If 'gnutls' is set too, it will be used instead.</flag>
+ <flag name='ssl' restrict='&lt;net-im/ekg2-0.3.0_rc'>Enable SSL/TLS support
+ through OpenSSL (for jabber plugin). If 'gnutls' is set too, it
+ will be used instead.</flag>
+ <flag name='ssl' restrict='&gt;=net-im/ekg2-0.3.0_rc'>Enable the complete
+ SSL/TLS support through OpenSSL. This also enables the 'sim' plugin
+ which relies on OpenSSL.</flag>
<flag name='static'>Link statically with plugins instead of installing
them as shared libraries (external libraries can still be linked
dynamically).</flag>