Add new useflags and some style improvements to live ebuild, thanks to Daniel Pielmeier for providing the ebuild diff

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

3 files changed, 29 insertions, 28 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 7b756845c309..fb9f38331893 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.27 2008/08/30 19:02:53 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.28 2008/09/01 18:51:57 jokey Exp $
+
+  01 Sep 2008; Markus Ullmann <jokey@gentoo.org> quassel-9999.ebuild:
+  Add new useflags and some style improvements to live ebuild, thanks to
+  Daniel Pielmeier for providing the ebuild diff
 
 *quassel-0.3.0-r1 (30 Aug 2008)
 *quassel-0.2.0_rc1-r1 (30 Aug 2008)
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 88d834e4e3fd..22a6b265b4e8 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -7,13 +7,13 @@ DIST quassel-0.2.0-rc1.tar.bz2 2135106 RMD160 8040ab1fe20b501cee2211f678f3fbf07a
 DIST quassel-0.3.0.tar.bz2 1967582 RMD160 2a21067dc8edcebcb478cb2c7b739dcde1e542dd SHA1 b12f45aaab8c545d23f565544764c1527542e015 SHA256 ce9b724b4a44bb201272be7ca43e0ca9424139e9a10708b631e08ec66fb6219c
 EBUILD quassel-0.2.0_rc1-r1.ebuild 2462 RMD160 7e6cc02b2c52900ba49d41c7565eabd03b3e217d SHA1 125596e915e0fb9f67bcadb5e817b94c539cfa2d SHA256 343937693484a5f34d7032c00e60149797c4a892bfc7728217360f400fa84958
 EBUILD quassel-0.3.0-r1.ebuild 2168 RMD160 d05018119ee9960d88cb75167919f7e8d6a08f87 SHA1 1e70742b31c7dc943e47dc3b5517dd79cd12af82 SHA256 b6e3fbda99f2dcebba00ddd8b2a996979eaf2f9859f0e987cec012fecf1bc11a
-EBUILD quassel-9999.ebuild 2349 RMD160 2477b317fc58790a32c944cc82597c68aa6b4787 SHA1 d04326969ce99b863d64d64a839c9eee822ff93a SHA256 f1174d4b44718894665f561df30f5f638fc77835624cc7ac269af0ff1b559494
-MISC ChangeLog 5294 RMD160 d43c08a2ba31276c0c5c7a05f41ed469b08d8a52 SHA1 245e89460dd63a5ded84adf490a9a20fc43a041d SHA256 55219b83d1d0fc1fb5b2d87cb2e593def16ccc15f8a4559714d447ecccddf4b7
+EBUILD quassel-9999.ebuild 2399 RMD160 3f1b2dd95974bffaadd1e437cf0b82149b4462ce SHA1 754b288cbb18046edfb64d0a46bc88582e1dcb9d SHA256 69e948e05b19b5221e5d0deae5b816fc26649b9ef70458b867ff4b04271ab3f8
+MISC ChangeLog 5487 RMD160 5ef6f36220a90969346d5d0ef8b9d0a7655ad539 SHA1 1c387ea356e4837e71c222a545696261fed8a30f SHA256 f20a66579d0dd8bd846ce002820b6fcaceb43d6eac75ea86bf96d3da0bd7a238
 MISC metadata.xml 770 RMD160 5a905a2b777f958a229b50a169b357978fa178a8 SHA1 10a1c0af8b6d105bcb28779d265cd3964519a92e SHA256 5de31da7c6c876b311907554328bc6a3cd61ac4d2b35b1d700dcd02d07530916
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki5mV0ACgkQz974XjDVpbnCxgCeO3ksxvvZ8uTEuyCTJgmbnjec
-2UgAoMKhRELFOi59nvLxfSzzm7Qm09hl
-=/kyH
+iEYEARECAAYFAki8OdYACgkQz974XjDVpbkuWwCfcFUplkuX5S9dM0E1F5YrG0n6
+VogAnje+N4k39pVk1Tdq7Gg7FDXdbohx
+=VP+8
 -----END PGP SIGNATURE-----
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 0fccd3f49571..dcd00e32ce9e 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.7 2008/08/30 19:02:53 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.8 2008/09/01 18:51:57 jokey Exp $
 
 EAPI=1
 
@@ -24,20 +24,18 @@ DESCRIPTION="Core/client IRC client."
 HOMEPAGE="http://quassel-irc.org/"
 
 LICENSE="GPL-3"
-
 KEYWORDS=""
-
 SLOT="0"
-
-IUSE="+X +server debug"
+IUSE="+dbus debug +server +ssl +X"
 
 RDEPEND="x11-libs/qt-core:4
 		server? (
 			x11-libs/qt-sql:4
 			x11-libs/qt-script:4
 		)
-		X? ( x11-libs/qt-gui:4 )"
-
+		X? ( x11-libs/qt-gui:4 )
+		dbus? ( x11-libs/qt-dbus )
+		ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.4.7"
 
@@ -49,16 +47,14 @@ pkg_setup() {
 		die "Both server and X USE flags unset."
 	fi
 
-	qt44=$(has_version x11-libs/qt-sql && echo yes || echo no)
-	if use server && ! built_with_use $([[ ${qt44} == "yes" ]] && echo "x11-libs/qt-sql sqlite" || echo "x11-libs/qt:4 sqlite3"); then
-		eerror "Quassel require Qt 4 built with SQLite support"
-		if [[ ${qt44} == "yes" ]]; then
-			eerror "Please rebuild x11-libs/qt-sql:4 with sqlite USE flag enabled."
-			die "Missing sqlite support in x11-libs/qt-sql:4"
-		else
-			eerror "Please rebuild x11-libs/qt:4 with sqlite3 USE flag enabled."
-			die "Missing sqlite3 support in x11-libs/qt:4"
-		fi
+	if use server && ! built_with_use x11-libs/qt-sql sqlite ; then
+		eerror "Please rebuild x11-libs/qt-sql:4 with sqlite USE flag enabled."
+		die "Missing sqlite support in x11-libs/qt-sql:4"
+	fi
+
+	if use ssl && ! built_with_use x11-libs/qt-core ssl ; then
+		eerror "Please rebuild x11-libs/qt-core:4 with ssl USE flag enabled."
+		die "Missing ssl support in x11-libs/qt-core:4"
 	fi
 }
 
@@ -66,8 +62,9 @@ src_compile() {
 	local mycmakeargs="
 		$(cmake-utils_use_want server CORE)
 		$(cmake-utils_use_want X QTCLIENT)
-		-DWANT_MONO=OFF
-		"
+		$(cmake-utils_use_with dbus DBUS)
+		$(cmake-utils_use_with ssl OPENSSL)
+		-DWANT_MONO=OFF"
 
 	cmake-utils_src_compile
 }
@@ -79,12 +76,12 @@ src_install() {
 	if use X; then
 		insinto /usr/share/icons/hicolor
 		# avoid the connected/ directory, get only the ${size}x${size}
-		doins -r "${S}"/src/icons/quassel/*x*
+		doins -r "${S}"/src/icons/quassel/*x* || die "installing icons failed"
 	fi
 
 	if use server; then
-		newinitd "${FILESDIR}"/quasselcore.init quasselcore
-		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+		newinitd "${FILESDIR}"/quasselcore.init quasselcore || die "newinitd failed"
+		newconfd "${FILESDIR}"/quasselcore.conf quasselcore || die "newconfd failed"
 	fi
 }