[gentoo-commits] gentoo-x86 commit in net-irc/quassel: ChangeLog quassel-9999-r1.ebuild quassel-0.2.0_rc1.ebuild metadata.xml quassel-0.2.9999.ebuild

[Markus Ullmann (jokey)]

jokey       08/08/26 12:01:44

  Modified:             ChangeLog quassel-9999-r1.ebuild
                        quassel-0.2.0_rc1.ebuild metadata.xml
                        quassel-0.2.9999.ebuild
  Log:
  Add init script and some other enhancements from Daniel Pielmeier in bug #217510
  (Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo i686)

Revision  Changes    Path
1.23                 net-irc/quassel/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?r1=1.22&r2=1.23

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ChangeLog	2 Jul 2008 22:52:24 -0000	1.22
+++ ChangeLog	26 Aug 2008 12:01:44 -0000	1.23
@@ -1,6 +1,12 @@
 # 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.22 2008/07/02 22:52:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.23 2008/08/26 12:01:44 jokey Exp $
+
+  26 Aug 2008; Markus Ullmann <jokey@g.o> +files/quasselcore.conf,
+  +files/quasselcore.init, metadata.xml, quassel-0.2.0_rc1.ebuild,
+  quassel-0.2.9999.ebuild, quassel-9999-r1.ebuild:
+  Add init script and some other enhancements from Daniel Pielmeier in bug
+  #217510
 
   02 Jul 2008; Diego Pettenò <flameeyes@g.o>
   quassel-0.2.0_rc1.ebuild, quassel-0.2.9999.ebuild, quassel-9999-r1.ebuild:



1.5                  net-irc/quassel/quassel-9999-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999-r1.ebuild?r1=1.4&r2=1.5

Index: quassel-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- quassel-9999-r1.ebuild	2 Jul 2008 22:52:24 -0000	1.4
+++ quassel-9999-r1.ebuild	26 Aug 2008 12:01:44 -0000	1.5
@@ -1,19 +1,19 @@
 # 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-r1.ebuild,v 1.4 2008/07/02 22:52:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999-r1.ebuild,v 1.5 2008/08/26 12:01:44 jokey Exp $
 
 EAPI=1
 
 inherit cmake-utils eutils
 
 if [[ ${PV} == *9999 ]]; then
-	inherit git
 	EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
 
 	case ${PV} in
 		0.2.9999) EGIT_BRANCH="0.2" ;;
 		*) EGIT_BRANCH="master"
 	esac
+	inherit git
 else
 	MY_P="${P/_/-}"
 	SRC_URI="http://quassel-irc.org/system/files/${MY_P}.tar.bz2"
@@ -31,17 +31,13 @@
 
 IUSE="+X +server debug"
 
-RDEPEND="|| (
-		(
-			x11-libs/qt-core:4
-			server? (
-				x11-libs/qt-sql:4
-				x11-libs/qt-script:4
-			)
-			X? ( x11-libs/qt-gui:4 )
+RDEPEND="x11-libs/qt-core:4
+		server? (
+			x11-libs/qt-sql:4
+			x11-libs/qt-script:4
 		)
-		=x11-libs/qt-4.3*:4
-	)"
+		X? ( x11-libs/qt-gui:4 )"
+
 DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.4.7"
 
@@ -85,4 +81,16 @@
 		# avoid the connected/ directory, get only the ${size}x${size}
 		doins -r "${S}"/src/icons/quassel/*x*
 	fi
+
+	if use server; then
+		newinitd "${FILESDIR}"/quasselcore.init quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+	fi
+}
+
+pkg_postinst() {
+	if use server; then
+		ewarn "In order to use the quassel init script you must set the"
+		ewarn "QUASSEL_USER variable in /etc/conf.d/quasselcore to your username."
+	fi
 }



1.3                  net-irc/quassel/quassel-0.2.0_rc1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-0.2.0_rc1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-0.2.0_rc1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-0.2.0_rc1.ebuild?r1=1.2&r2=1.3

Index: quassel-0.2.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.2.0_rc1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- quassel-0.2.0_rc1.ebuild	2 Jul 2008 22:52:24 -0000	1.2
+++ quassel-0.2.0_rc1.ebuild	26 Aug 2008 12:01:44 -0000	1.3
@@ -1,19 +1,19 @@
 # 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-0.2.0_rc1.ebuild,v 1.2 2008/07/02 22:52:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.2.0_rc1.ebuild,v 1.3 2008/08/26 12:01:44 jokey Exp $
 
 EAPI=1
 
 inherit cmake-utils eutils
 
 if [[ ${PV} == *9999 ]]; then
-	inherit git
 	EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
 
 	case ${PV} in
 		0.2.9999) EGIT_BRANCH="0.2" ;;
 		*) EGIT_BRANCH="master"
 	esac
+	inherit git
 else
 	MY_P="${P/_/-}"
 	SRC_URI="http://quassel-irc.org/system/files/${MY_P}.tar.bz2"
@@ -87,4 +87,16 @@
 			newins "${S}"/src/icons/quassel/connected/${size}.png quassel.png
 		done
 	fi
+
+	if use server; then
+		newinitd "${FILESDIR}"/quasselcore.init quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+	fi
+}
+
+pkg_postinst() {
+	if use server; then
+		ewarn "In order to use the quassel init script you must set the"
+		ewarn "QUASSEL_USER variable in /etc/conf.d/quasselcore to your username."
+	fi
 }



1.3                  net-irc/quassel/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	2 Mar 2008 21:26:44 -0000	1.2
+++ metadata.xml	26 Aug 2008 12:01:44 -0000	1.3
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>net-irc</herd>
   <maintainer>
-    <email>flameeyes@g.o</email>
+    <email>jokey@g.o</email>
   </maintainer>
   <use>
     <flag name="X">



1.5                  net-irc/quassel/quassel-0.2.9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-0.2.9999.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-0.2.9999.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-0.2.9999.ebuild?r1=1.4&r2=1.5

Index: quassel-0.2.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.2.9999.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- quassel-0.2.9999.ebuild	2 Jul 2008 22:52:24 -0000	1.4
+++ quassel-0.2.9999.ebuild	26 Aug 2008 12:01:44 -0000	1.5
@@ -1,19 +1,19 @@
 # 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-0.2.9999.ebuild,v 1.4 2008/07/02 22:52:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.2.9999.ebuild,v 1.5 2008/08/26 12:01:44 jokey Exp $
 
 EAPI=1
 
 inherit cmake-utils eutils
 
 if [[ ${PV} == *9999 ]]; then
-	inherit git
 	EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
 
 	case ${PV} in
 		0.2.9999) EGIT_BRANCH="0.2" ;;
 		*) EGIT_BRANCH="master"
 	esac
+	inherit git
 else
 	MY_P="${P/_/-}"
 	SRC_URI="http://quassel-irc.org/system/files/${MY_P}.tar.bz2"
@@ -85,4 +85,16 @@
 		# avoid the connected/ directory, get only the ${size}x${size}
 		doins -r "${S}"/src/icons/quassel/*x*
 	fi
+
+	if use server; then
+		newinitd "${FILESDIR}"/quasselcore.init quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+	fi
+}
+
+pkg_postinst() {
+	if use server; then
+		ewarn "In order to use the quassel init script you must set the"
+		ewarn "QUASSEL_USER variable in /etc/conf.d/quasselcore to your username."
+	fi
 }