Version bump.

Package-Manager: portage-13636-svn/cvs/Linux x86_64

4 files changed, 107 insertions, 6 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index 82c6d52aee62..3b52275205b6 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/kvirc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.83 2009/05/16 14:32:25 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.84 2009/06/12 14:25:50 arfrever Exp $
+
+*kvirc-4.0_pre3244 (12 Jun 2009)
+
+  12 Jun 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +kvirc-4.0_pre3244.ebuild, kvirc-9999.ebuild:
+  Version bump.
 
   16 May 2009; Mounir Lamouri <volkmar@gentoo.org> metadata.xml:
   Use global gsm USE flag instead of local one.
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 8a4468513684..ea42bde059c0 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -6,10 +6,12 @@ DIST kvirc-3.4.0.tar.bz2 5287688 RMD160 d11125df71bcde4683882880acd6fcfe430b8a51
 DIST kvirc-3.4.2.tar.bz2 5421405 RMD160 927392a58061e2c7a25f5ecf9e3a9e98725cbad2 SHA1 bbcae24f0b84d458688bc83fe6314d30963bc143 SHA256 7335bda4c646d70aee1bd565a678a7a2af379313e48d5c81e3a063775a351a33
 DIST kvirc-4.0_pre3154.tar.bz2 5316419 RMD160 54e9cb4841d592ee3cd175831a1c96b6f7ae5402 SHA1 c64be2e62eca339768057bfed7dd2ec7daeeb52b SHA256 ecaf429319da25bdd7b3f4a69af1f976841a88d77b5140b8800b83cffbcec246
 DIST kvirc-4.0_pre3190.tar.bz2 5325090 RMD160 a0e2d7d376399bc4c23dc6b20a888cc7af669dd8 SHA1 08fca7a5a85e5525d2c38ddddf53fa9abd4744a4 SHA256 889e267a74bbcb50f8345db7ac52e44c5afe09ba07e1ec61b97bc1a7ce32adb1
+DIST kvirc-4.0_pre3244.tar.bz2 5331403 RMD160 ca603557b11286c110d44a626d2056767c19a476 SHA1 e8fe7c4b875ce851d461a88f4528afdcd1bb23bb SHA256 c97f159b9ad3ec3d8ee1fbb876c6f3c95735ff179e2aeff3bbfb1109cc0436bf
 EBUILD kvirc-3.4.0.ebuild 2041 RMD160 16867805576d8d00f6a0660f906040a8c3c26ddc SHA1 422fa040668cbc23b78b3dcac394d08a94af32bc SHA256 14fc2baccdf65b397c3df1ecc5a708f86a664b8f3d2cc9a50b9ec92a8e28953e
 EBUILD kvirc-3.4.2.ebuild 2040 RMD160 4035db8998121636d4b419c1ef08a89822c1c1e8 SHA1 7332f3b3742c96dd0b8c022da0d7f036dff460dd SHA256 7322ae9c4b20a2a6a88ba7ec6b781265c9eb45b50fcb0c671ccdd5e39344720f
 EBUILD kvirc-4.0_pre3154.ebuild 2492 RMD160 05b8ad608330e422e66232c9beaefcd4ec6bccd8 SHA1 2c1256f4485a833fb527eef22d9071d5755d20e3 SHA256 5fa97df2ac3f63705e26c99068c3548060a945d34289add92386503ad62b0b80
 EBUILD kvirc-4.0_pre3190.ebuild 2495 RMD160 e3f9027de9a1c1630e62cf31a46b1387c0bab87d SHA1 6b15e008ba74aa69dbf9d804539fd6ccfc99757e SHA256 de5b1674f143a8a5b677abb0ded6cab954d2679297af847951aed46f3d6c165c
-EBUILD kvirc-9999.ebuild 2546 RMD160 dd0bf63697bd697db1f67c407c4e77edb4b5b675 SHA1 4d54a57ac54b2a1f84830818fa59dab54a9e26e3 SHA256 869d9eff1398a3b83467f1bfe500efb43e488f39c80673e15487453dce13bbe9
-MISC ChangeLog 13129 RMD160 d415ab495fa679171e455b564a94169c716399a4 SHA1 066bde95b2b315dafc048b35668b9ee47c9ca0cb SHA256 e3df76645a3ddd00d5857859b155b20e87bd019d20a305693fe3409014a049c5
+EBUILD kvirc-4.0_pre3244.ebuild 2649 RMD160 caaafe2c8c4a9a3587df0752f703091c186844a1 SHA1 9f1b03c4a14e04bd1f7f0e95e50b4420bdc48132 SHA256 d6ccac941bc2b00aea0847ebe3acc2a2a56f1b27e90c46fe46d1df75dd74234d
+EBUILD kvirc-9999.ebuild 2698 RMD160 b6ef755bad231967a9b9f3c34abf7923f599f062 SHA1 cb4489f2191b4d87e912b5fc5c25279e50b9f501 SHA256 80c6c18b1097b1666a6e051a9685ccadbfa49935db59108662f47d4b6be85b01
+MISC ChangeLog 13302 RMD160 bf4cdbc0d2b92a10ea849f686fdc2b0922f80159 SHA1 12fc1f235afc776487607d4ae4dc662da79e1c28 SHA256 62505ac1037c313eb2da6f23b13c50d6e6cf1da999ec1e82848016180e00003c
 MISC metadata.xml 740 RMD160 2bae99ca2c8438b23fb3ddd1c9d4d997e09850a0 SHA1 4393b5464a710ddde3ef35b667b40319b8be6e19 SHA256 a646a60bd59122dff94463e28397804aa18064bb5405c6e3a06572aaef84a63c
diff --git a/net-irc/kvirc/kvirc-4.0_pre3244.ebuild b/net-irc/kvirc/kvirc-4.0_pre3244.ebuild
new file mode 100644
index 000000000000..81b4cb78c387
--- /dev/null
+++ b/net-irc/kvirc/kvirc-4.0_pre3244.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-4.0_pre3244.ebuild,v 1.1 2009/06/12 14:25:50 arfrever Exp $
+
+EAPI="2"
+
+inherit cmake-utils multilib
+
+DESCRIPTION="Advanced IRC Client"
+HOMEPAGE="http://www.kvirc.net/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="kvirc"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="audiofile +crypt +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python +qt-dbus qt-webkit +ssl +transparency"
+
+RDEPEND="
+	sys-libs/zlib
+	x11-libs/qt-core
+	x11-libs/qt-gui
+	kde? ( >=kde-base/kdelibs-4 )
+	oss? ( audiofile? ( media-libs/audiofile ) )
+	perl? ( dev-lang/perl )
+	phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
+	python? ( dev-lang/python )
+	qt-dbus? ( x11-libs/qt-dbus )
+	qt-webkit? ( x11-libs/qt-webkit )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+RDEPEND="${RDEPEND}
+	gsm? ( media-sound/gsm )"
+
+DOCS="ChangeLog TODO"
+
+pkg_setup() {
+	if use audiofile && ! use oss; then
+		die "USE=\"audiofile\" requires USE=\"oss\""
+	fi
+}
+
+src_prepare() {
+	local VERSIO_PRAESENS="${PV#*_pre}"
+	elog "Setting revision number to ${VERSIO_PRAESENS}"
+	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" r${VERSIO_PRAESENS}\"/" -i src/kvirc/ui/kvi_frame.cpp || die "Failed to set revision number"
+}
+
+src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs="
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCOEXISTENCE=1
+		-DLIB_SUFFIX=${libdir#lib}
+		-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 oss OSS)
+		$(cmake-utils_use_want perl PERL)
+		$(cmake-utils_use_want phonon PHONON)
+		$(cmake-utils_use_want profile MEMORY_PROFILE)
+		$(cmake-utils_use_want python PYTHON)
+		$(cmake-utils_use_want qt-dbus QTDBUS)
+		$(cmake-utils_use_want qt-webkit QTWEBKIT)
+		$(cmake-utils_use_want ssl OPENSSL)
+		$(cmake-utils_use_want transparency TRANSPARENCY)"
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	mv "${D}"usr/share/man/man1/kvirc.1 "${D}"usr/share/man/man1/kvirc4.1 || die "mv kvirc.1 failed"
+
+	elog "In order to keep KVIrc 4 and KVIrc3 working both side-by-side"
+	elog "man page for ${P} is under \"man kvirc4\""
+}
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index 82acceac96ea..c350616b02bf 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.19 2009/03/29 23:27:45 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.20 2009/06/12 14:25:50 arfrever Exp $
 
 EAPI="2"
 
@@ -15,14 +15,14 @@ ESVN_PROJECT="kvirc"
 LICENSE="kvirc"
 SLOT="4"
 KEYWORDS=""
-IUSE="audiofile +crypt +dcc_voice debug doc gsm +ipc ipv6 kde +nls +perl +phonon profile +python +qt-dbus qt-webkit +ssl +transparency"
+IUSE="audiofile +crypt +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python +qt-dbus qt-webkit +ssl +transparency"
 
 RDEPEND="
 	sys-libs/zlib
 	x11-libs/qt-core
 	x11-libs/qt-gui
-	audiofile? ( media-libs/audiofile )
 	kde? ( >=kde-base/kdelibs-4 )
+	oss? ( audiofile? ( media-libs/audiofile ) )
 	perl? ( dev-lang/perl )
 	phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
 	python? ( dev-lang/python )
@@ -37,6 +37,12 @@ RDEPEND="${RDEPEND}
 
 DOCS="ChangeLog TODO"
 
+pkg_setup() {
+	if use audiofile && ! use oss; then
+		die "USE=\"audiofile\" requires USE=\"oss\""
+	fi
+}
+
 src_prepare() {
 	subversion_wc_info
 	local VERSIO_PRAESENS="${ESVN_WC_REVISION}"
@@ -61,6 +67,7 @@ src_configure() {
 		$(cmake-utils_use_want ipv6 IPV6)
 		$(cmake-utils_use_want kde KDE4)
 		$(cmake-utils_use_want nls GETTEXT)
+		$(cmake-utils_use_want oss OSS)
 		$(cmake-utils_use_want perl PERL)
 		$(cmake-utils_use_want phonon PHONON)
 		$(cmake-utils_use_want profile MEMORY_PROFILE)