Revert back to original systemd unit file after consulting systemd team

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 565C32BC)

3 files changed, 7 insertions, 22 deletions

diff --git a/sci-mathematics/gimps/ChangeLog b/sci-mathematics/gimps/ChangeLog
index ecf211caeb8d..24eef81809d6 100644
--- a/sci-mathematics/gimps/ChangeLog
+++ b/sci-mathematics/gimps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/gimps
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/ChangeLog,v 1.64 2014/03/07 19:32:56 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/ChangeLog,v 1.65 2014/03/07 21:40:07 tomka Exp $
+
+  07 Mar 2014; Thomas Kahle <tomka@gentoo.org> -files/gimps.service-r1,
+  gimps-28.5.ebuild:
+  Revert back to original systemd unit file after consulting systemd team
 
 *gimps-28.5 (07 Mar 2014)
 
diff --git a/sci-mathematics/gimps/files/gimps.service-r1 b/sci-mathematics/gimps/files/gimps.service-r1
deleted file mode 100644
index 022c613e77b5..000000000000
--- a/sci-mathematics/gimps/files/gimps.service-r1
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Great Internet Mersenne Prime Search client
-After=network.target local-fs.target
-Wants=local-fs.target
-
-[Service]
-EnvironmentFile=/etc/conf.d/gimps
-User=nobody
-Group=nobody
-PermissionsStartOnly=true
-ConditionPathIsDirectory=${GIMPS_DIR}
-ExecStartPre=-/bin/sh -c "chown %u ${GIMPS_DIR}"
-ConditionPathExist=${GIMPS_DIR}/local.txt
-ExecStart=/opt/gimps/mprime -w${GIMPS_DIR} ${GIMPS_OPTIONS}
-StandardOutput=null
-StandardError=journal
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sci-mathematics/gimps/gimps-28.5.ebuild b/sci-mathematics/gimps/gimps-28.5.ebuild
index 3f2672ceafed..705f391eb864 100644
--- a/sci-mathematics/gimps/gimps-28.5.ebuild
+++ b/sci-mathematics/gimps/gimps-28.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/gimps-28.5.ebuild,v 1.1 2014/03/07 19:32:56 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gimps/gimps-28.5.ebuild,v 1.2 2014/03/07 21:40:07 tomka Exp $
 
 EAPI=4
 
@@ -43,7 +43,7 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}-26.6-r1-init.d" gimps
 	newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
 
-	systemd_dounit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+	systemd_dounit "${FILESDIR}/${PN}.service"
 	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
 }