Make init script baselayout-1 compatible wrt bug #235953 thanks to Daniel Pielmeier, revbump released versions and fix naming for the live ebuild

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo i686)

7 files changed, 27 insertions, 193 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 74efcfcd279a..7b756845c309 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,17 @@
 # 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.26 2008/08/27 18:09:10 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.27 2008/08/30 19:02:53 jokey Exp $
+
+*quassel-0.3.0-r1 (30 Aug 2008)
+*quassel-0.2.0_rc1-r1 (30 Aug 2008)
+
+  30 Aug 2008; Markus Ullmann <jokey@gentoo.org> files/quasselcore.init,
+  -quassel-0.2.0_beta1.ebuild, -quassel-0.2.0_rc1.ebuild,
+  +quassel-0.2.0_rc1-r1.ebuild, -quassel-0.2.9999.ebuild,
+  -quassel-0.3.0.ebuild, +quassel-0.3.0-r1.ebuild, +quassel-9999.ebuild,
+  -quassel-9999-r1.ebuild:
+  Make init script baselayout-1 compatible wrt bug #235953 thanks to Daniel
+  Pielmeier, revbump released versions and fix naming for the live ebuild
 
   27 Aug 2008; Markus Ullmann <jokey@gentoo.org> quassel-0.3.0.ebuild:
   Add some testing keywords
diff --git a/net-irc/quassel/files/quasselcore.init b/net-irc/quassel/files/quasselcore.init
index 8f1e98698ee8..7edb80fb8b89 100644
--- a/net-irc/quassel/files/quasselcore.init
+++ b/net-irc/quassel/files/quasselcore.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.init,v 1.1 2008/08/26 12:01:44 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.init,v 1.2 2008/08/30 19:02:54 jokey Exp $
 
 depend() {
 	need net
@@ -9,14 +9,21 @@ depend() {
 
 start() {
 	ebegin "Starting Quassel Core"
-	start-stop-daemon --start --user $QUASSEL_USER --background --make-pidfile \
-	--pidfile /var/run/quassel.pid --exec /usr/bin/quasselcore -- ${QUASSEL_OPTS}
+	if [ -x /etc/init.d/root ]; then
+		# running on baselayout-2/openrc
+		start-stop-daemon --start --user ${QUASSEL_USER} --background --make-pidfile \
+		--pidfile /var/run/quassel.pid --exec /usr/bin/quasselcore -- ${QUASSEL_OPTS}
+	else
+		# running on baselayout-1
+		start-stop-daemon --start --chuid ${QUASSEL_USER} --background --make-pidfile \
+		--pidfile /var/run/quassel.pid --env HOME="/home/${QUASSEL_USER}" \
+		--exec /usr/bin/quasselcore -- ${QUASSEL_OPTS}
+	fi
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Quassel Core"
-	start-stop-daemon --stop --user $QUASSEL_USER --pidfile /var/run/quassel.pid \
-	--exec /usr/bin/quasselcore
+	start-stop-daemon --stop --pidfile /var/run/quassel.pid --exec /usr/bin/quasselcore
 	eend $?
 }
diff --git a/net-irc/quassel/quassel-0.2.0_beta1.ebuild b/net-irc/quassel/quassel-0.2.0_beta1.ebuild
deleted file mode 100644
index 60d2ad29d773..000000000000
--- a/net-irc/quassel/quassel-0.2.0_beta1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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_beta1.ebuild,v 1.3 2008/06/29 10:01:09 tove Exp $
-
-EAPI=1
-
-inherit qt4
-
-if [[ ${PV} == 9999 ]]; then
-	inherit subversion
-	ESVN_REPO_URI="http://svn.quassel-irc.org/trunk"
-else
-	MY_P="${P/_/-}"
-	SRC_URI="http://quassel-irc.org/system/files/${MY_P}.tar.bz2"
-	S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="Core/client IRC client."
-HOMEPAGE="http://quassel-irc.org/"
-
-LICENSE="GPL-3"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-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 )
-		)
-		=x11-libs/qt-4.3*:4
-	)"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if ! use server && ! use X; then
-		eerror "You have to build one or both of quassel client or server."
-		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
-	fi
-}
-
-src_compile() {
-	local BUILD=""
-	use server && BUILD="${BUILD} core"
-	use X && BUILD="${BUILD} qtclient"
-
-	eqmake4 ${PN}.pro BUILD="${BUILD}" || die "eqmake4 failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	local targets=""
-	use server && targets="${targets} build/targets/quasselcore"
-	use X && targets="${targets} build/targets/quasselclient"
-	dobin $targets  || die "quasselcore install failed"
-
-	# Only install the desktop file if the X client was installed
-	if use X; then
-		sed -i -e 's:Exec=quassel:Exec=quasselclient:' ${PN}.desktop \
-			|| die "failed to fix desktop file"
-		domenu ${PN}.desktop || die "desktop file install failed"
-	fi
-
-	dodoc ChangeLog README README.Qtopia || die "dodoc failed"
-}
diff --git a/net-irc/quassel/quassel-0.2.0_rc1.ebuild b/net-irc/quassel/quassel-0.2.0_rc1-r1.ebuild
index 9400345a0ebf..96a490f04bbd 100644
--- a/net-irc/quassel/quassel-0.2.0_rc1.ebuild
+++ b/net-irc/quassel/quassel-0.2.0_rc1-r1.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-0.2.0_rc1.ebuild,v 1.3 2008/08/26 12:01:44 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.2.0_rc1-r1.ebuild,v 1.1 2008/08/30 19:02:53 jokey Exp $
 
 EAPI=1
 
diff --git a/net-irc/quassel/quassel-0.2.9999.ebuild b/net-irc/quassel/quassel-0.2.9999.ebuild
deleted file mode 100644
index 4ea4548248b2..000000000000
--- a/net-irc/quassel/quassel-0.2.9999.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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.5 2008/08/26 12:01:44 jokey Exp $
-
-EAPI=1
-
-inherit cmake-utils eutils
-
-if [[ ${PV} == *9999 ]]; then
-	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"
-	S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="Core/client IRC client."
-HOMEPAGE="http://quassel-irc.org/"
-
-LICENSE="GPL-3"
-
-KEYWORDS=""
-
-SLOT="0"
-
-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 )
-		)
-		=x11-libs/qt-4.3*:4
-	)"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.7"
-
-DOCS="ChangeLog README README.Qtopia"
-
-pkg_setup() {
-	if ! use server && ! use X; then
-		eerror "You have to build one or both of quassel client or server."
-		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
-	fi
-}
-
-src_compile() {
-	local mycmakeargs="
-		$(cmake-utils_use_want server CORE)
-		$(cmake-utils_use_want X QTCLIENT)
-		-DWANT_MONO=OFF
-		"
-
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Only install the icons if the X client was installed
-	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*
-	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
-}
diff --git a/net-irc/quassel/quassel-0.3.0.ebuild b/net-irc/quassel/quassel-0.3.0-r1.ebuild
index ea39815ec58d..3b80441926f0 100644
--- a/net-irc/quassel/quassel-0.3.0.ebuild
+++ b/net-irc/quassel/quassel-0.3.0-r1.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-0.3.0.ebuild,v 1.3 2008/08/27 18:09:10 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.3.0-r1.ebuild,v 1.1 2008/08/30 19:02:53 jokey Exp $
 
 EAPI=1
 
diff --git a/net-irc/quassel/quassel-9999-r1.ebuild b/net-irc/quassel/quassel-9999.ebuild
index aa93182fcc2b..0fccd3f49571 100644
--- a/net-irc/quassel/quassel-9999-r1.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-r1.ebuild,v 1.5 2008/08/26 12:01:44 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.7 2008/08/30 19:02:53 jokey Exp $
 
 EAPI=1