Init script fixes

(Portage version: 2.1.2_rc1-r1)
 (Signed Manifest commit)

3 files changed, 14 insertions, 79 deletions

diff --git a/app-misc/g15composer/Manifest b/app-misc/g15composer/Manifest
index 2c1913063fe0..e84254130b4d 100644
--- a/app-misc/g15composer/Manifest
+++ b/app-misc/g15composer/Manifest
@@ -20,18 +20,18 @@ EBUILD g15composer-1.1.ebuild 955 RMD160 f2a56dffe7ebf551c2bfc826ebbda70e235e990
 MD5 4b2276368095b3df80ae57f29f7ee304 g15composer-1.1.ebuild 955
 RMD160 f2a56dffe7ebf551c2bfc826ebbda70e235e9905 g15composer-1.1.ebuild 955
 SHA256 53f8d35723fce7bd9eb16403011c84e4a8db808c4dcc1a8aa56d995078dcc9e8 g15composer-1.1.ebuild 955
-EBUILD g15composer-2.1.ebuild 1577 RMD160 d5c35dba01f04317ea5e5642f00051eafdc2c23d SHA1 7e2b4840a7a2ffd17fdf36fb2484c4e889d5dcd5 SHA256 af74332a4dae42bd3ebc922ce16ae435359688148822b533cd6d269be1f1eff0
-MD5 caa509e2fc2419b7a593ebdb882eb452 g15composer-2.1.ebuild 1577
-RMD160 d5c35dba01f04317ea5e5642f00051eafdc2c23d g15composer-2.1.ebuild 1577
-SHA256 af74332a4dae42bd3ebc922ce16ae435359688148822b533cd6d269be1f1eff0 g15composer-2.1.ebuild 1577
+EBUILD g15composer-2.1-r1.ebuild 1583 RMD160 6e649efe0effb88e5fb1ad44a119755305b46ee0 SHA1 8e40bdda5448321aefe4850e9dfb54c73923532f SHA256 d345bede067d0130bb3c4aeb68d0cf336a4f68da310471b5c4396def22718014
+MD5 81b0b1c760af30a49cfe34f5b881231e g15composer-2.1-r1.ebuild 1583
+RMD160 6e649efe0effb88e5fb1ad44a119755305b46ee0 g15composer-2.1-r1.ebuild 1583
+SHA256 d345bede067d0130bb3c4aeb68d0cf336a4f68da310471b5c4396def22718014 g15composer-2.1-r1.ebuild 1583
 EBUILD g15composer-3.0.1.ebuild 1592 RMD160 0bf18c32211cbbc21a844c2faea5433fd4108345 SHA1 6b066de3cd0c517f147815d6f45a33dd45d35cb4 SHA256 845062bff2dc78aff62051c5198fdc994d53bae5a6b7a9638b3f311704783110
 MD5 d6b79ebecfa955cde9af0a0b3813c0ac g15composer-3.0.1.ebuild 1592
 RMD160 0bf18c32211cbbc21a844c2faea5433fd4108345 g15composer-3.0.1.ebuild 1592
 SHA256 845062bff2dc78aff62051c5198fdc994d53bae5a6b7a9638b3f311704783110 g15composer-3.0.1.ebuild 1592
-MISC ChangeLog 1330 RMD160 454d6cde5b2293e91b1206f95beb98dbbd0c9c9f SHA1 8fa48aa8e52dfb4e30a649812a600cd72f284d43 SHA256 25333c7f12950f80cea9166c07c0d6804cabf119fb959364886d2d9d5907f541
-MD5 ec8525adcde076251015a0b0d222edb6 ChangeLog 1330
-RMD160 454d6cde5b2293e91b1206f95beb98dbbd0c9c9f ChangeLog 1330
-SHA256 25333c7f12950f80cea9166c07c0d6804cabf119fb959364886d2d9d5907f541 ChangeLog 1330
+MISC ChangeLog 1490 RMD160 fcb6831dfe39aaac74d626d1a64c0394c62f31f6 SHA1 ffc109ea8544a2c2528b7ef296f0460e6666c2fe SHA256 63c1876a8acc476715e249fb895df3c09e3e3035d7cc70502e1a4d04c5f4b083
+MD5 f5bc049c73dbfb2716e35a3269af999f ChangeLog 1490
+RMD160 fcb6831dfe39aaac74d626d1a64c0394c62f31f6 ChangeLog 1490
+SHA256 63c1876a8acc476715e249fb895df3c09e3e3035d7cc70502e1a4d04c5f4b083 ChangeLog 1490
 MISC metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 SHA1 c212d5a20354a60471162a82c403f1a5235d1d9d SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a
 MD5 be4a34ac317e81ea820c84bc04b9c0d8 metadata.xml 250
 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 metadata.xml 250
@@ -39,16 +39,16 @@ SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a metadata
 MD5 2e3449a29253129ea374a1d9bddfbf3b files/digest-g15composer-1.1 247
 RMD160 e5459c4b33b6fe418262b541f0e85577e7c14a33 files/digest-g15composer-1.1 247
 SHA256 b091cfe0c46fdb2c731d12fa43710413903dce760c5089ffd83b94caa3fbb0b7 files/digest-g15composer-1.1 247
-MD5 dec7a738f7e947b85546abf54af5d054 files/digest-g15composer-2.1 247
-RMD160 5b7de726f99dc027b975e7d881267adb61af373b files/digest-g15composer-2.1 247
-SHA256 ca142ac7a46ea37587b38a153c94432613d51e940c61b0f471fb94d328c59e5b files/digest-g15composer-2.1 247
+MD5 dec7a738f7e947b85546abf54af5d054 files/digest-g15composer-2.1-r1 247
+RMD160 5b7de726f99dc027b975e7d881267adb61af373b files/digest-g15composer-2.1-r1 247
+SHA256 ca142ac7a46ea37587b38a153c94432613d51e940c61b0f471fb94d328c59e5b files/digest-g15composer-2.1-r1 247
 MD5 add1bf1dd7a9539d8eddeb2df885fb31 files/digest-g15composer-3.0.1 253
 RMD160 998637c3a5fbb651f38d30319df6329709544df0 files/digest-g15composer-3.0.1 253
 SHA256 0014671dcb960d21bc86e8e1066053a5b2f6949fdd74032fec03a567fa8155b7 files/digest-g15composer-3.0.1 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFR9oLz974XjDVpbkRAgWYAKCmrzBK5Rohf83onvdMi3UfIcuTjwCfeQ+z
-IXggld3V9y4DMhni2GwZhq4=
-=WJTe
+iD8DBQFFR9+iz974XjDVpbkRAtvJAJ9rm8yC4XhxmaPI+xKPiiQtc70zVgCgm96E
+Wu5JBrCNjCerBsk3pM9B2ms=
+=m3Xl
 -----END PGP SIGNATURE-----
diff --git a/app-misc/g15composer/files/digest-g15composer-2.1 b/app-misc/g15composer/files/digest-g15composer-2.1
deleted file mode 100644
index 81b82d5c656d..000000000000
--- a/app-misc/g15composer/files/digest-g15composer-2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 65f38249fe14afb482e763ae0abf6ce6 g15composer-2.1.tar.bz2 73269
-RMD160 ed16f6d85a4042c597df7e9d8a5909a52b893eca g15composer-2.1.tar.bz2 73269
-SHA256 bbde3ac09db37b9aeb8f67e89e4cadc6c92e1529b3b9b431d863ddcecb9aa58e g15composer-2.1.tar.bz2 73269
diff --git a/app-misc/g15composer/g15composer-2.1.ebuild b/app-misc/g15composer/g15composer-2.1.ebuild
deleted file mode 100644
index 17cf77419a97..000000000000
--- a/app-misc/g15composer/g15composer-2.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-2.1.ebuild,v 1.1 2006/10/24 07:41:11 jokey Exp $
-
-inherit eutils
-
-DESCRIPTION="A library to render text and shapes into a buffer usable by the Logitech G15 keyboard"
-HOMEPAGE="http://g15tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="amarok truetype"
-
-RDEPEND="app-misc/g15daemon
-	dev-libs/libg15render
-	truetype? ( media-libs/freetype )
-	amarok? ( kde-base/kdelibs  dev-perl/DCOP-Amarok-Player )"
-
-DEPEND="${RDEPEND}
-	dev-libs/libg15"
-
-pkg_setup() {
-	if use amarok && ! built_with_use dev-lang/perl ithreads ; then
-		echo
-		eerror "dev-lang/perl must be built with USE=\"ithreads\" for the Amarok display to work."
-		die
-	fi
-}
-
-src_compile() {
-	econf \
-		$(use_enable truetype ttf ) \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	newinitd "${FILESDIR}/${P}.rc" ${PN}
-	newconfd "${FILESDIR}/${P}.confd" ${PN}
-
-	dodoc AUTHORS README ChangeLog
-
-	exeinto "${ROOT}usr/share/${PN}"
-	doexe examples/*
-
-	if use amarok ; then
-		exeinto "${ROOT}usr/share/apps/amarok/scripts"
-		newexe examples/amarok-g15-perl.pl g15-display.pl
-	fi
-}
-
-pkg_postinst() {
-	if use amarok; then
-		einfo "g15-display.pl was installed into your Amarok script directory."
-		einfo "To start it, have a look at Tools -> Script Manager in the Amarok menu."
-	fi
-}