From 84b67791f034b6032bb5b1e63df3d39dd923cb08 Mon Sep 17 00:00:00 2001 From: Markus Ullmann Date: Wed, 7 Jun 2006 07:58:34 +0000 Subject: [PATCH] Improved CVS live ebuild Package-Manager: portage-2.1_rc4-r3 --- net-irc/kvirc/ChangeLog | 5 ++- net-irc/kvirc/Manifest | 22 ++++++------ net-irc/kvirc/kvirc-9999.ebuild | 61 ++++++++++++++++++--------------- 3 files changed, 48 insertions(+), 40 deletions(-) diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog index 5d0eb0235283..8ccf9fdada22 100644 --- a/net-irc/kvirc/ChangeLog +++ b/net-irc/kvirc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-irc/kvirc # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.35 2006/06/06 06:08:16 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.36 2006/06/07 07:58:34 jokey Exp $ + + 07 Jun 2006; Markus Ullmann kvirc-9999.ebuild: + Improved CVS live ebuild 06 Jun 2006; Markus Ullmann kvirc-9999.ebuild: Removing senseless RESTRICTS diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest index 8d46a7eace30..51d86fee2d1b 100644 --- a/net-irc/kvirc/Manifest +++ b/net-irc/kvirc/Manifest @@ -24,14 +24,14 @@ EBUILD kvirc-3.2.3.ebuild 1966 RMD160 5aa6cea8895ae9cac29268599fcaaa146349088c S MD5 78610cd298779d7c89597029af363fd2 kvirc-3.2.3.ebuild 1966 RMD160 5aa6cea8895ae9cac29268599fcaaa146349088c kvirc-3.2.3.ebuild 1966 SHA256 381d164b13d399fc47d9d1ed7a4d1a08f45e4ae0029b684a0fadc18f5e0c5a44 kvirc-3.2.3.ebuild 1966 -EBUILD kvirc-9999.ebuild 1329 RMD160 a20e2a8ef865f0e863f6af58e76dc95068b76680 SHA1 b7ab9ecbd5adf6d20bf6726a6c8267c4ac8d03ea SHA256 7ebf50a7650269a38faeeeb6fa6b9eb3045e5c077a2532bec9f141316535a30d -MD5 773c8e2c07e8e7d0222b733cf31477ba kvirc-9999.ebuild 1329 -RMD160 a20e2a8ef865f0e863f6af58e76dc95068b76680 kvirc-9999.ebuild 1329 -SHA256 7ebf50a7650269a38faeeeb6fa6b9eb3045e5c077a2532bec9f141316535a30d kvirc-9999.ebuild 1329 -MISC ChangeLog 6006 RMD160 57d005abcc1d110a2be7d8a00b07237a7ccf52e1 SHA1 3d0e9b3d0c62ad0425421f62d22ae0e8a7aca700 SHA256 ebaef875e3c3ac1e6dfe6d354f8a2ce5c8203fb9569d1e5da4077cfdea6ae88b -MD5 1b9052e619e062cc89cea4f77d84259a ChangeLog 6006 -RMD160 57d005abcc1d110a2be7d8a00b07237a7ccf52e1 ChangeLog 6006 -SHA256 ebaef875e3c3ac1e6dfe6d354f8a2ce5c8203fb9569d1e5da4077cfdea6ae88b ChangeLog 6006 +EBUILD kvirc-9999.ebuild 1889 RMD160 c6e5f7d9541295084ddcf804d7d75b2005a9ca03 SHA1 fb86cc87f90566ace1afc22ce5e37742025a889a SHA256 36eb6012be9cc395ff9611eb2ee3df9d1dd74d1fc91e6e4b4a65a3f23e2941b4 +MD5 3172f5a6455a16d1366488df64aab738 kvirc-9999.ebuild 1889 +RMD160 c6e5f7d9541295084ddcf804d7d75b2005a9ca03 kvirc-9999.ebuild 1889 +SHA256 36eb6012be9cc395ff9611eb2ee3df9d1dd74d1fc91e6e4b4a65a3f23e2941b4 kvirc-9999.ebuild 1889 +MISC ChangeLog 6102 RMD160 c2984ae49eb153a9e0c300f48801120d55ff0f9b SHA1 67d4b8cc47bb77379508e2ed3b3b5cc4dca6589c SHA256 dab4d6480cd67d8d533862f746940630523125474158cdc227c4214439b58854 +MD5 a173ecd889ef55cffde2cf3fa4ac0ac3 ChangeLog 6102 +RMD160 c2984ae49eb153a9e0c300f48801120d55ff0f9b ChangeLog 6102 +SHA256 dab4d6480cd67d8d533862f746940630523125474158cdc227c4214439b58854 ChangeLog 6102 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160 @@ -48,7 +48,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEhRvbz974XjDVpbkRArLbAJ4tNvFvEbqMLuv7Zmvf4s6Om/dwAACgup9r -Z9tbW5zb4FRDsLHBy7oqfTw= -=DF3n +iD8DBQFEhoc3z974XjDVpbkRAqPjAKCKPoAPWb0Ky8WuiDqGOqcTEmQitACgnid5 +Q6Ho55s+ou+trXoqv11EWVo= +=tzl+ -----END PGP SIGNATURE----- diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild index 01076d6480e3..cbfee5388f9f 100644 --- a/net-irc/kvirc/kvirc-9999.ebuild +++ b/net-irc/kvirc/kvirc-9999.ebuild @@ -1,20 +1,25 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.2 2006/06/06 06:08:16 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.3 2006/06/07 07:58:34 jokey Exp $ -inherit kde cvs +inherit eutils kde-functions cvs autotools DESCRIPTION="An advanced IRC Client" -HOMEPAGE="http://www.kvirc.net" +HOMEPAGE="http://www.kvirc.net/" LICENSE="kvirc" SLOT="3" KEYWORDS="-*" -IUSE="arts debug esd ipv6 kde oss ssl" +IUSE="debug esd ipv6 kde oss ssl" -DEPEND="esd? ( media-sound/esound ) +RDEPEND="esd? ( media-sound/esound ) + ssl? ( dev-libs/openssl ) oss? ( media-libs/audiofile ) - ssl? ( dev-libs/openssl )" + kde? ( >=kde-base/kdelibs-3 ) + =x11-libs/qt-3*" + +DEPEND="${RDEPEND} + sys-devel/gettext" ECVS_SERVER="cvs.kvirc.net:/cvs" ECVS_MODULE="kvirccvs/kvirc" @@ -22,42 +27,42 @@ ECVS_TOP_DIR="${DISTDIR}/cvs-src/${P}" S="${WORKDIR}/${ECVS_MODULE}" -if use kde ; then - need-kde 3.3 -else - need-qt 3 -fi - src_unpack() { cvs_src_unpack + cd ${S} + einfo "Generating configure script, this takes a moment" + ./autogen.sh + epatch ${FILESDIR}/${PN}-3.2.3-kdedir-fix.patch } src_compile() { set-qtdir 3 set-kdedir 3 - local myconf + # use aa even when kde support is disabled; remove the splash screen + # to speed up the startup. + local myconf="--with-aa-fonts --without-splash-screen + --with-big-channels --with-pizza" - export myconf="${myconf} \ - --with-aa-fonts --with-big-channels --with-pizza \ - $(use_with arts arts-support) \ - $(use_with debug debug-symbols) \ - $(use_with esd esd-support) \ - $(use_with ipv6 ipv6-support) \ - $(use_with kde kde-support) \ - $(use_with oss af-support) \ - $(use_with ssl ssl-support)" + # For myconf, we can't do it the easy way (use_with) because the configure + # script will assume we're telling it not to include support. + myconf="${myconf} `use_with debug debug-symbols`" + use kde || myconf="${myconf} --without-kde-support --without-arts-support" + use ipv6 || myconf="${myconf} --without-ipv6-support" + use esd || myconf="${myconf} --without-esd-support" + use ssl || myconf="${myconf} --without-ssl-support" - export WANT_AUTOCONF="2.5" - export WANT_AUTOMAKE="1.5" + [ "${ARCH}" == "x86" ] && myconf="${myconf} --with-ix86-asm" - ./autogen.sh - econf ${myconf} || dir "failed to configure" + need-autoconf 2.5 + need-automake 1.5 + + econf ${myconf} || die "failed to configure" emake -j1 || die "failed to make" } src_install() { - make install docs DESTDIR=${D} || die "make install failed" + make install DESTDIR="${D}" || die "make install failed" + make docs DESTDIR="${D}" || die "make docs failed" dodoc ChangeLog README TODO } - -- 2.26.2