Version bump.

(Portage version: 14068-svn/cvs/Linux x86_64)

3 files changed, 41 insertions, 89 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index ff0dc25e0b03..0f41c09816bb 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.85 2009/07/11 03:34:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.86 2009/08/15 19:22:41 arfrever Exp $
+
+*kvirc-4.0_pre3412 (15 Aug 2009)
+
+  15 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -kvirc-4.0_pre3154.ebuild, -kvirc-4.0_pre3190.ebuild,
+  +kvirc-4.0_pre3412.ebuild:
+  Version bump.
 
 *kvirc-4.0_pre3330 (11 Jul 2009)
 
diff --git a/net-irc/kvirc/kvirc-4.0_pre3154.ebuild b/net-irc/kvirc/kvirc-4.0_pre3154.ebuild
deleted file mode 100644
index 8faa92c74eb2..000000000000
--- a/net-irc/kvirc/kvirc-4.0_pre3154.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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_pre3154.ebuild,v 1.5 2009/04/12 09:03:52 klausman 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"
-IUSE="audiofile +crypt +dcc_voice debug doc gsm +ipc ipv6 kde +nls +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 )
-	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"
-
-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 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-4.0_pre3190.ebuild b/net-irc/kvirc/kvirc-4.0_pre3412.ebuild
index 92097329b9e9..99e098a8e38e 100644
--- a/net-irc/kvirc/kvirc-4.0_pre3190.ebuild
+++ b/net-irc/kvirc/kvirc-4.0_pre3412.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-4.0_pre3190.ebuild,v 1.2 2009/05/03 14:09:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-4.0_pre3412.ebuild,v 1.1 2009/08/15 19:22:41 arfrever Exp $
 
 EAPI="2"
 
@@ -13,21 +13,23 @@ 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 +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 )
+	>=x11-libs/qt-core-4.5
+	>=x11-libs/qt-gui-4.5
+	>=x11-libs/qt-sql-4.5
 	kde? ( >=kde-base/kdelibs-4 )
+	oss? ( audiofile? ( media-libs/audiofile ) )
 	perl? ( dev-lang/perl )
-	phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
+	phonon? ( || ( media-sound/phonon >=x11-libs/qt-phonon-4.5 ) )
 	python? ( dev-lang/python )
-	qt-dbus? ( x11-libs/qt-dbus )
-	qt-webkit? ( x11-libs/qt-webkit )
+	qt-dbus? ( >=x11-libs/qt-dbus-4.5 )
+	qt-webkit? ( >=x11-libs/qt-webkit-4.5 )
 	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.6.4
 	nls? ( sys-devel/gettext )
 	doc? ( app-doc/doxygen )"
 RDEPEND="${RDEPEND}
@@ -35,8 +37,14 @@ RDEPEND="${RDEPEND}
 
 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}"
+	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"
 }
@@ -47,6 +55,7 @@ src_configure() {
 		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCOEXISTENCE=1
 		-DLIB_SUFFIX=${libdir#lib}
+		-DMANUAL_REVISION=${VERSIO_PRAESENS}
 		-DVERBOSE=1
 		$(cmake-utils_use_want audiofile AUDIOFILE)
 		$(cmake-utils_use_want crypt CRYPT)
@@ -58,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)
@@ -77,3 +87,17 @@ src_install() {
 	elog "In order to keep KVIrc 4 and KVIrc3 working both side-by-side"
 	elog "man page for ${P} is under \"man kvirc4\""
 }
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-4.0_pre3412:4"; then
+		log_location_change="1"
+	fi
+}
+
+pkg_postinst() {
+	if [[ "${log_location_change}" == "1" ]]; then
+		elog "Default location of logs has changed from ~/.config/KVIrc/log to ~/log."
+		elog "You can set location of logs in KVIrc configuration."
+		ebeep 6
+	fi
+}