diff options
author | Sven Wegener <swegener@gentoo.org> | 2008-03-30 19:49:37 +0000 |
---|---|---|
committer | Sven Wegener <swegener@gentoo.org> | 2008-03-30 19:49:37 +0000 |
commit | b1f94886f7200016648d54b6893816570d4625c2 (patch) | |
tree | 232f6bfcf956b4d4be87bb38a8e0145bbcfaf8cf | |
parent | Fix the hack for USE="-quicktime win32codecs", Bug #213836. (diff) | |
download | gentoo-2-b1f94886f7200016648d54b6893816570d4625c2.tar.gz gentoo-2-b1f94886f7200016648d54b6893816570d4625c2.tar.bz2 gentoo-2-b1f94886f7200016648d54b6893816570d4625c2.zip |
Cleanup.
(Portage version: 2.1.4.4)
-rw-r--r-- | net-im/centerim/ChangeLog | 7 | ||||
-rw-r--r-- | net-im/centerim/centerim-4.22.2.ebuild | 124 | ||||
-rw-r--r-- | net-im/centerim/centerim-4.22.3.ebuild | 112 | ||||
-rw-r--r-- | net-im/centerim/files/centerim-4.22.2-fribidi.patch | 13 |
4 files changed, 6 insertions, 250 deletions
diff --git a/net-im/centerim/ChangeLog b/net-im/centerim/ChangeLog index f5d04a0a69e6..96777009e865 100644 --- a/net-im/centerim/ChangeLog +++ b/net-im/centerim/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-im/centerim # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.15 2008/03/28 21:16:00 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.16 2008/03/30 19:49:36 swegener Exp $ + + 30 Mar 2008; Sven Wegener <swegener@gentoo.org> + -files/centerim-4.22.2-fribidi.patch, -centerim-4.22.2.ebuild, + -centerim-4.22.3.ebuild: + Cleanup. 28 Mar 2008; Markus Meier <maekke@gentoo.org> centerim-4.22.3-r1.ebuild: amd64/x86 stable, security bug #214204 diff --git a/net-im/centerim/centerim-4.22.2.ebuild b/net-im/centerim/centerim-4.22.2.ebuild deleted file mode 100644 index 13828c728411..000000000000 --- a/net-im/centerim/centerim-4.22.2.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.2.ebuild,v 1.5 2008/02/17 13:09:37 opfer Exp $ - -WANT_AUTOMAKE="1.10" -WANT_AUTOCONF="none" - -inherit eutils autotools - -PROTOCOL_IUSE="aim gadu icq irc jabber lj msn rss yahoo" -IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr" - -DESCRIPTION="CenterIM is a fork of CenterICQ - a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client" -if [[ ${PV} = *_p* ]] # is this a snaphot? -then - SRC_URI="http://www.centerim.org/download/snapshots/${PN}-${PV/*_p/}.tar.gz" -else - SRC_URI="http://www.centerim.org/download/releases/${P}.tar.gz" -fi -HOMEPAGE="http://www.centerim.org/" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 x86" - -DEPEND=">=sys-libs/ncurses-5.2 - bidi? ( dev-libs/fribidi ) - ssl? ( >=dev-libs/openssl-0.9.6g ) - jpeg? ( media-libs/jpeg ) - jabber? ( - otr? ( net-libs/libotr ) - crypt? ( >=app-crypt/gpgme-1.0.2 ) - ) - msn? ( - net-misc/curl - dev-libs/openssl - )" - -RDEPEND="${DEPEND} - nls? ( sys-devel/gettext )" - -S="${WORKDIR}"/${P/_p*} - -check_protocol_iuse() { - local flag - - for flag in ${PROTOCOL_IUSE} - do - use ${flag} && return 0 - done - - return 1 -} - -pkg_setup() { - if ! check_protocol_iuse - then - eerror - eerror "Please activate at least one of the following protocol USE flags:" - eerror "${PROTOCOL_IUSE}" - eerror - die "Please activate at least one protocol USE flag!" - fi - - if use msn && ! built_with_use net-misc/curl ssl - then - eerror - eerror "As of right now, the msn use flags requires curl to be built" - eerror "with SSL support. Make sure ssl is in your USE flags and" - eerror "re-emerge net-misc/curl." - eerror - die "net-misc/curl dependencie issue" - fi - - if use otr && ! use jabber - then - eerror - eerror "Support for OTR is only supported with Jabber!" - eerror - die "Support for OTR is only supported with Jabber!" - fi - - if use gadu && ! use jpeg - then - ewarn - ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!" - ewarn - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-fribidi.patch - - eautomake -} - -src_compile() { - econf \ - $(use_with ssl) \ - $(use_enable aim) \ - $(use_with bidi fribidi) \ - $(use_with jpeg libjpeg) \ - $(use_with otr libotr) \ - $(use_enable gadu gg) \ - $(use_enable icq) \ - $(use_enable irc) \ - $(use_enable jabber) \ - $(use_enable lj) \ - $(use_enable msn) \ - $(use_enable nls locales-fix) \ - $(use_enable nls) \ - $(use_enable rss) \ - $(use_enable yahoo) \ - || die "econf failed" - emake || die "emake failed" -} - -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog FAQ README THANKS TODO -} diff --git a/net-im/centerim/centerim-4.22.3.ebuild b/net-im/centerim/centerim-4.22.3.ebuild deleted file mode 100644 index 90c82bded138..000000000000 --- a/net-im/centerim/centerim-4.22.3.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.3.ebuild,v 1.1 2008/03/12 19:17:49 swegener Exp $ - -inherit eutils - -PROTOCOL_IUSE="aim gadu icq irc jabber lj msn rss yahoo" -IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr" - -DESCRIPTION="CenterIM is a fork of CenterICQ - a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client" -if [[ ${PV} = *_p* ]] # is this a snaphot? -then - SRC_URI="http://www.centerim.org/download/snapshots/${PN}-${PV/*_p/}.tar.gz" -else - SRC_URI="http://www.centerim.org/download/releases/${P}.tar.gz" -fi -HOMEPAGE="http://www.centerim.org/" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" - -DEPEND=">=sys-libs/ncurses-5.2 - bidi? ( dev-libs/fribidi ) - ssl? ( >=dev-libs/openssl-0.9.6g ) - jpeg? ( media-libs/jpeg ) - jabber? ( - otr? ( net-libs/libotr ) - crypt? ( >=app-crypt/gpgme-1.0.2 ) - ) - msn? ( - net-misc/curl - dev-libs/openssl - )" - -RDEPEND="${DEPEND} - nls? ( sys-devel/gettext )" - -S="${WORKDIR}"/${P/_p*} - -check_protocol_iuse() { - local flag - - for flag in ${PROTOCOL_IUSE} - do - use ${flag} && return 0 - done - - return 1 -} - -pkg_setup() { - if ! check_protocol_iuse - then - eerror - eerror "Please activate at least one of the following protocol USE flags:" - eerror "${PROTOCOL_IUSE}" - eerror - die "Please activate at least one protocol USE flag!" - fi - - if use msn && ! built_with_use net-misc/curl ssl - then - eerror - eerror "As of right now, the msn use flags requires curl to be built" - eerror "with SSL support. Make sure ssl is in your USE flags and" - eerror "re-emerge net-misc/curl." - eerror - die "net-misc/curl dependencie issue" - fi - - if use otr && ! use jabber - then - eerror - eerror "Support for OTR is only supported with Jabber!" - eerror - die "Support for OTR is only supported with Jabber!" - fi - - if use gadu && ! use jpeg - then - ewarn - ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!" - ewarn - fi -} - -src_compile() { - econf \ - $(use_with ssl) \ - $(use_enable aim) \ - $(use_with bidi fribidi) \ - $(use_with jpeg libjpeg) \ - $(use_with otr libotr) \ - $(use_enable gadu gg) \ - $(use_enable icq) \ - $(use_enable irc) \ - $(use_enable jabber) \ - $(use_enable lj) \ - $(use_enable msn) \ - $(use_enable nls locales-fix) \ - $(use_enable nls) \ - $(use_enable rss) \ - $(use_enable yahoo) \ - || die "econf failed" - emake || die "emake failed" -} - -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog FAQ README THANKS TODO -} diff --git a/net-im/centerim/files/centerim-4.22.2-fribidi.patch b/net-im/centerim/files/centerim-4.22.2-fribidi.patch deleted file mode 100644 index e6f53d8114de..000000000000 --- a/net-im/centerim/files/centerim-4.22.2-fribidi.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- centerim-4.22.2/src/Makefile.am -+++ centerim-4.22.2/src/Makefile.am -@@ -6,6 +6,10 @@ - if HAVE_LIBOTR - centerim_SOURCES += imotr.cc - endif -+if HAVE_FRIBIDI -+centerim_LDADD += $(FRIBIDI_LIBS) -+#centerim_CFLAGS += $(FRIBIDI_CFLAGS) -+endif - if BUILD_FIRETALK - centerim_LDFLAGS += -L$(top_builddir)/firetalk - centerim_LDADD += -lfiretalk |