Heavily modified live ebuild, thanks to Arfrever Frehtes Taifersar Arahesis in bug #224919

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo i686

4 files changed, 75 insertions, 48 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index bc4fca718620..0e6d08d25baf 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/kvirc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.64 2008/03/23 10:49:45 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.65 2008/09/03 20:31:57 jokey Exp $
+
+  03 Sep 2008; Markus Ullmann <jokey@gentoo.org> metadata.xml,
+  kvirc-9999.ebuild:
+  Heavily modified live ebuild, thanks to Arfrever Frehtes Taifersar
+  Arahesis in bug #224919
 
   22 Mar 2008; Markus Ullmann <jokey@gentoo.org> kvirc-3.4.0.ebuild:
   Remove a debug stopper, thanks to Arfrever.FTA@GMail.Com in bug #214191
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 064de7f3046a..af5623ce9b19 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -11,13 +11,13 @@ DIST kvirc-3.4.0.tar.bz2 5287688 RMD160 d11125df71bcde4683882880acd6fcfe430b8a51
 EBUILD kvirc-3.2.6_pre20070714.ebuild 1839 RMD160 70988f402618cc17c0ee685734eb880f15cbf9f4 SHA1 c53d3dc503888247792ed0cc5a8245485bb5cb08 SHA256 60295e9cb4dd7353279bbe7ac307bcb2dbe9dcfb97544b191f52cf58b5f8d03d
 EBUILD kvirc-3.2.6_pre20080204.ebuild 1815 RMD160 f96cbf41f88db762a243724aec6178af75058591 SHA1 d522db21a93418acd82510f85a63089392374114 SHA256 57543c058eff2f11c0e00ff4ba360d445cf426c181a4c71cfa8accbe32bc6d63
 EBUILD kvirc-3.4.0.ebuild 2039 RMD160 2457152cafad13e34932e0df16daa48b6ba1f61f SHA1 2171f8c604cf99254fc554d69ea39e36ea9a2711 SHA256 25bced19dc46e141f90a9b7d15bd89e8d523fa3458d968a7717ce35dd992b5e5
-EBUILD kvirc-9999.ebuild 1800 RMD160 1919f77dbcd3b26f8a6316846b82487f4df04f88 SHA1 ae5d621986a596dafaea437344d0e4569dec9e1c SHA256 ed39cd5df83d16cd2f9d20bba805487de1abbf75d8b655381a0aaca32390dc7a
-MISC ChangeLog 10548 RMD160 7d7dc85403d4f204db801d2d43deee79279b066c SHA1 6ada29fea8d165152cb06c89baf66f7fa9088dfa SHA256 fc2e8b3a438ade713d34a827899250edcc0ae18bd10d36250ee4ac1b2d4a811a
-MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
+EBUILD kvirc-9999.ebuild 2238 RMD160 3085b27ec77a7631f99aaac4f29f4f71903fb131 SHA1 4485a8706e38aec98db24612a8ef58ae06dd88e6 SHA256 f66bc2faff03c04cdd01ead82fc9946d23e2be4f19441baa0d6b18a48d218c69
+MISC ChangeLog 10729 RMD160 719a589391e0a54bf03f3c09d19621236a10dc0f SHA1 c3e78fa046a9587de4287344f309163cbea42edb SHA256 55dd14b400214eb863488fdafb4896a2e8a9fe8c93336c02aeda5de23758a112
+MISC metadata.xml 749 RMD160 93748b0241f7e5728eee5f8a202faf5096787b80 SHA1 1da129420d5166c8db717bc81ec7675f936b63c8 SHA256 9592cd16372c09904414d8c8cb50479bb27824f249ecb2b9d71d66313563eb87
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH5jWBV3J2n04EauwRAqNZAJoDMPVVuSFdGqlHAVpi6AI79MtnNgCdEPrN
-axkGPmp9JI8nXm/aGnFShqI=
-=Xrw5
+iEYEARECAAYFAki+9EYACgkQz974XjDVpbkKvQCg4A4kD33J0RCGTRuF6P976F/8
+zC4AoJgMoPtjx6uoDe2xYNjpUquPFDcq
+=TC31
 -----END PGP SIGNATURE-----
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index b9f37356fe3d..6f9c581dd8b3 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,62 +1,72 @@
 # Copyright 1999-2008 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.10 2008/01/19 13:59:12 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.11 2008/09/03 20:31:57 jokey Exp $
 
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-inherit autotools eutils kde-functions subversion
+EAPI="1"
 
-DESCRIPTION="An advanced IRC Client"
+inherit cmake-utils multilib subversion
+
+DESCRIPTION="Advanced IRC Client"
 HOMEPAGE="http://www.kvirc.net/"
 
 LICENSE="kvirc"
-SLOT="3"
+SLOT="4"
 KEYWORDS=""
-IUSE="debug esd ipv6 kde oss ssl"
+IUSE="audiofile +crypt +dcc_voice debug doc +gsm +ipc ipv6 kde nls profile +qt-dbus qt-phonon ssl +transparency"
+# IUSE="audiofile +crypt +dcc_voice debug doc +gsm +ipc ipv6 kde nls profile +qt-dbus qt-phonon qt-webkit ssl +transparency"
+# Support for Qt-WebKit not implemented yet
 
-RDEPEND="esd? ( media-sound/esound )
-	ssl? ( dev-libs/openssl )
-	oss? ( media-libs/audiofile )
-	kde? ( =kde-base/kdelibs-3.5* )
-	=x11-libs/qt-3*"
+RDEPEND="
+	sys-libs/zlib
+	x11-libs/qt-core
+	x11-libs/qt-gui
+	x11-libs/qt-qt3support
+	audiofile? ( media-libs/audiofile )
+	kde? ( kde-base/kdelibs:kde-4 )
+	qt-dbus? ( x11-libs/qt-dbus )
+	qt-phonon? ( x11-libs/qt-phonon )
+	ssl? ( dev-libs/openssl )"
+	# qt-webkit? ( x11-libs/qt-webkit )
 
 DEPEND="${RDEPEND}
-	sys-devel/gettext"
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )"
+
+DOCS="ChangeLog TODO"
 
 ESVN_REPO_URI="https://svn.kvirc.de/svn/trunk/kvirc"
 ESVN_PROJECT="kvirc"
-ESVN_BOOTSTRAP="./autogen.sh"
 
 src_unpack() {
 	subversion_src_unpack
-	epatch "${FILESDIR}"/${PN}-svn-kdedir-fix.patch
+	subversion_wc_info
+	VERSIO_PRAESENS="${ESVN_WC_REVISION}"
+	elog "Setting revision number to ${VERSIO_PRAESENS}"
+	sed -i -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" r${VERSIO_PRAESENS}\"/" src/kvirc/ui/kvi_frame.cpp || die "Failed to set revision number"
 }
 
 src_compile() {
-	set-qtdir 3
-	set-kdedir 3
-
-	# 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"
-
-	# 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"
-
-	[[ "${ARCH}" == "x86" ]] && myconf="${myconf} --with-ix86-asm"
-
-	econf ${myconf} || die "econf failed"
-	emake -j1 || die "emake failed"
-}
+	local mycmakeargs="
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCOEXISTENCE=1
+		-DLIB_INSTALL_PREFIX="/usr/$(get_libdir)"
+		-DVERBOSE=1
+		$(cmake-utils_use_want audiofile AUDIOFILE)
+		$(cmake-utils_use_want crypt CRYPT)
+		$(cmake-utils_use_want dcc_voice DCC_VOICE)
+		$(cmake-utils_use_want debug DEBUG)
+		$(cmake-utils_use_want doc DOXYGEN)
+		$(cmake-utils_use_want gsm GSM)
+		$(cmake-utils_use_want ipc IPC)
+		$(cmake-utils_use_want ipv6 IPV6)
+		$(cmake-utils_use_want kde KDE4)
+		$(cmake-utils_use_want nls GETTEXT)
+		$(cmake-utils_use_want profile MEMORY_PROFILE)
+		$(cmake-utils_use_want qt-dbus QTDBUS)
+		$(cmake-utils_use_want qt-phonon PHONON)
+		$(cmake-utils_use_want ssl OPENSSL)
+		$(cmake-utils_use_want transparency TRANSPARENCY)"
+		# $(cmake-utils_use_want qt-webkit QTWEBKIT)
 
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	emake DESTDIR="${D}" docs || die "emake docs failed"
-	dodoc ChangeLog README TODO
+	cmake-utils_src_compile
 }
diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
index 6ef15e900f17..c0a5c16f43ee 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -2,4 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-irc</herd>
+  <maintainer restrict="&gt;=net-irc/kvirc-4">
+    <email>Arfrever.FTA@GMail.Com</email>
+    <name>Arfrever Frehtes Taifersar Arahesis</name>
+  </maintainer>
+  <use>
+    <flag name="dcc_voice">Support voice over DCC chats</flag>
+    <flag name="gsm">enable support for media-sound/gsm</flag>
+    <flag name="ipc">add support for IPC between kvirc processes</flag>
+    <flag name="qt-dbus">enable use of Qt's DBUS interface for IPC</flag>
+    <flag name="qt-phonon">use phonon instead of command-based sound</flag>
+    <flag name="transparency">compile in fake-transparency</flag>
+  </use>
 </pkgmetadata>