Version bump and cleanup

Package-Manager: portage-2.1.2_pre3-r7

4 files changed, 31 insertions, 94 deletions

diff --git a/app-misc/g15composer/Manifest b/app-misc/g15composer/Manifest
index 0bdadae911de..db863b99f938 100644
--- a/app-misc/g15composer/Manifest
+++ b/app-misc/g15composer/Manifest
@@ -1,38 +1,46 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX g15composer-1.0.rc 734 RMD160 60634e5df89a5925b75ba10424ecc899556759fe SHA1 8bd32e2fccbf52980ce449bdfb0821c4f270e1c3 SHA256 63892a2c6d9ffe3c5d55c8aa23c06d180929e785e8a925b2b9e3b64a81e5aedf
-MD5 eda110bd7358383d7165e9f29b26c343 files/g15composer-1.0.rc 734
-RMD160 60634e5df89a5925b75ba10424ecc899556759fe files/g15composer-1.0.rc 734
-SHA256 63892a2c6d9ffe3c5d55c8aa23c06d180929e785e8a925b2b9e3b64a81e5aedf files/g15composer-1.0.rc 734
-DIST g15composer-1.0.tar.bz2 68465 RMD160 0a7f16ff1f2609096728f08e7dfb774a55018f2b SHA1 3482a2f9f5efc14429a10b2d9f2a7bcd35f29c0b SHA256 13fada88ccfac737d6429a55816543531e22835e0481ecbe8cc8db9212872150
+AUX g15composer-1.1.initd 737 RMD160 57b7f6135ab48dd587e793e74ce36de4d147be95 SHA1 01637e58637e0879a1b5e9cac926efa318dbee30 SHA256 fe12bcbe0d2a5a8cf7cab7e01bf50f73d37a03571b6b89b955106e5ff5591c69
+MD5 27352b82a03e114a05813dfb4401fc02 files/g15composer-1.1.initd 737
+RMD160 57b7f6135ab48dd587e793e74ce36de4d147be95 files/g15composer-1.1.initd 737
+SHA256 fe12bcbe0d2a5a8cf7cab7e01bf50f73d37a03571b6b89b955106e5ff5591c69 files/g15composer-1.1.initd 737
+AUX g15composer-2.1.confd 334 RMD160 201d38323e1425e2a42c9033d42ed7f93b5164d5 SHA1 a1a1c902681cc1ff24ee81598b824ce1b4af19db SHA256 88ce03f1427db99b2fbafcda352a1597a068491ae79b65af58815294c593ec76
+MD5 76c8067d89a245c98df65477eb1d7c13 files/g15composer-2.1.confd 334
+RMD160 201d38323e1425e2a42c9033d42ed7f93b5164d5 files/g15composer-2.1.confd 334
+SHA256 88ce03f1427db99b2fbafcda352a1597a068491ae79b65af58815294c593ec76 files/g15composer-2.1.confd 334
+AUX g15composer-2.1.initd 688 RMD160 f1ecf37edbd86238f8bf8b2d121f99e8523dc0e2 SHA1 7e4d48d134b84c044cc68e91a1810322ad12bc12 SHA256 f2a663bc3a76a9614272e6001c696407e9145964409fb292f48f76ff062b6a29
+MD5 d16c0e6f16c4b11908db440b5be7cbc2 files/g15composer-2.1.initd 688
+RMD160 f1ecf37edbd86238f8bf8b2d121f99e8523dc0e2 files/g15composer-2.1.initd 688
+SHA256 f2a663bc3a76a9614272e6001c696407e9145964409fb292f48f76ff062b6a29 files/g15composer-2.1.initd 688
 DIST g15composer-1.1.tar.bz2 70140 RMD160 51d431adfc4469f8195c077d49e82b98bea04b57 SHA1 6b30f1c521fb1c45f7ce628fc812a09feb6e827a SHA256 52220b0e3e1219ecf5504f8b70d7be23a4e12d640b9367e34a3db6bbfe2dc2ef
-EBUILD g15composer-1.0.ebuild 948 RMD160 3d6e5314031a0f8be51f270098ebeff42b1d1ea0 SHA1 b273221741617c2a31e6fd8ebaa16e23991d59a7 SHA256 0fde7bda7ab9463f79dd8c59237b45f587c622910718a1d75e0893c3ac22b209
-MD5 ad5dfc3bd81712f6dc15e16076b4636d g15composer-1.0.ebuild 948
-RMD160 3d6e5314031a0f8be51f270098ebeff42b1d1ea0 g15composer-1.0.ebuild 948
-SHA256 0fde7bda7ab9463f79dd8c59237b45f587c622910718a1d75e0893c3ac22b209 g15composer-1.0.ebuild 948
-EBUILD g15composer-1.1.ebuild 953 RMD160 510b4ca3dc8116351a72c153c57e80208b5d3f4d SHA1 db74c742515471d756b458c7d24be0708d8bbe97 SHA256 8213bde376155c0ed3271af2a83da09356f0136813d8d587e146a0d3d2651e41
-MD5 14b36b524ba268a1de6cfb8e832fa21f g15composer-1.1.ebuild 953
-RMD160 510b4ca3dc8116351a72c153c57e80208b5d3f4d g15composer-1.1.ebuild 953
-SHA256 8213bde376155c0ed3271af2a83da09356f0136813d8d587e146a0d3d2651e41 g15composer-1.1.ebuild 953
-MISC ChangeLog 872 RMD160 bc9d39b03a1b752bf7963b62c4c3cc3de619efa6 SHA1 a54e1b5268e81791d7b259fe96a7c764785367d8 SHA256 d5dbb38b3be3743ac63f6782fa90d3982e8342add1e9085230069530f394dd4d
-MD5 a92bb828e01515853f82835653bef77f ChangeLog 872
-RMD160 bc9d39b03a1b752bf7963b62c4c3cc3de619efa6 ChangeLog 872
-SHA256 d5dbb38b3be3743ac63f6782fa90d3982e8342add1e9085230069530f394dd4d ChangeLog 872
+DIST g15composer-2.1.tar.bz2 73269 RMD160 ed16f6d85a4042c597df7e9d8a5909a52b893eca SHA1 7c9953c08320ae9feda8dcd398315cc6b2b1664b SHA256 bbde3ac09db37b9aeb8f67e89e4cadc6c92e1529b3b9b431d863ddcecb9aa58e
+EBUILD g15composer-1.1.ebuild 960 RMD160 5b2a0ba4c00fdec6b9c02b55610db510099f5980 SHA1 bfd9302e6cb1b4eaca015a8cf014603177795d2d SHA256 f461cee70b67f782a3bfd469fa23d16711d061c6bf9c829745c91d19a5e2350c
+MD5 f39a6c0e558660c1fd4588c1d061cc6d g15composer-1.1.ebuild 960
+RMD160 5b2a0ba4c00fdec6b9c02b55610db510099f5980 g15composer-1.1.ebuild 960
+SHA256 f461cee70b67f782a3bfd469fa23d16711d061c6bf9c829745c91d19a5e2350c g15composer-1.1.ebuild 960
+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
+MISC ChangeLog 1178 RMD160 1b71dc9d397022e3c187822eddd077bc2eadbe03 SHA1 c5f7b714ae45d26239aea0b44d44127188141ec2 SHA256 d5498250a6d7636de8bcd094e55038286707dddde6bdb4f77b8038a1c96a2b2d
+MD5 d381ec602c1aef6e4119a16c9c45a318 ChangeLog 1178
+RMD160 1b71dc9d397022e3c187822eddd077bc2eadbe03 ChangeLog 1178
+SHA256 d5498250a6d7636de8bcd094e55038286707dddde6bdb4f77b8038a1c96a2b2d ChangeLog 1178
 MISC metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 SHA1 c212d5a20354a60471162a82c403f1a5235d1d9d SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a
 MD5 be4a34ac317e81ea820c84bc04b9c0d8 metadata.xml 250
 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 metadata.xml 250
 SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a metadata.xml 250
-MD5 33d3384d3aba6561cc1edd936b42007a files/digest-g15composer-1.0 247
-RMD160 62206c6e697eaa51f9cee91ee2a2f65bd9e07122 files/digest-g15composer-1.0 247
-SHA256 a5d7c3967be096ed2be6ab7672749c2b0375f0b786c419359dbcd69bc6a2f484 files/digest-g15composer-1.0 247
 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFNr6Jz974XjDVpbkRAsWwAKC793NDXP3U1yztdrEXdrViBTsqZgCfTSen
-7ICkpLxqbm4AIFzd/cW3TfU=
-=FFx+
+iD8DBQFFPcOfz974XjDVpbkRAoi9AJ0ehFV5nrifi0A1EQ99eigKg91kpACghwmn
++4va5wFSytJfnwDu/jZ4xkA=
+=PKhf
 -----END PGP SIGNATURE-----
diff --git a/app-misc/g15composer/files/digest-g15composer-1.0 b/app-misc/g15composer/files/digest-g15composer-1.0
deleted file mode 100644
index 9986413b9742..000000000000
--- a/app-misc/g15composer/files/digest-g15composer-1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 38eb5213088f637d06273ee3fe5dd22f g15composer-1.0.tar.bz2 68465
-RMD160 0a7f16ff1f2609096728f08e7dfb774a55018f2b g15composer-1.0.tar.bz2 68465
-SHA256 13fada88ccfac737d6429a55816543531e22835e0481ecbe8cc8db9212872150 g15composer-1.0.tar.bz2 68465
diff --git a/app-misc/g15composer/files/g15composer-1.0.rc b/app-misc/g15composer/files/g15composer-1.0.rc
deleted file mode 100644
index 2d6f391b29af..000000000000
--- a/app-misc/g15composer/files/g15composer-1.0.rc
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/files/g15composer-1.0.rc,v 1.1 2006/10/04 19:02:24 jokey Exp $
-
-depend() {
-	need g15daemon
-}
-
-start() {
-	NODE="/dev/${SVCNAME}"
-	ebegin "Starting ${SVCNAME}"
-	mknod -m720 "${NODE}" p
-	chgrp users "${NODE}"
-	PIDFILE=/var/run/${SVCNAME}.pid
-	start-stop-daemon --start --background --pidfile ${PIDFILE} --make-pidfile --exec /usr/bin/g15composer -- "${NODE}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stoping ${SVCNAME}"
-	PIDFILE=/var/run/${SVCNAME}.pid
-	start-stop-daemon --stop --pidfile ${PIDFILE} --name g15composer
-	NODE="/dev/${SVCNAME}"
-	rm "${NODE}"
-	eend $?
-}
\ No newline at end of file
diff --git a/app-misc/g15composer/g15composer-1.0.ebuild b/app-misc/g15composer/g15composer-1.0.ebuild
deleted file mode 100644
index c6319717e39c..000000000000
--- a/app-misc/g15composer/g15composer-1.0.ebuild
+++ /dev/null
@@ -1,41 +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-1.0.ebuild,v 1.2 2006/10/14 10:05:44 corsair 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 ~ppc64 ~x86"
-IUSE="truetype"
-
-RDEPEND="app-misc/g15daemon
-	dev-libs/libg15render
-	truetype? ( media-libs/freetype )"
-
-DEPEND="${RDEPEND}
-	dev-libs/libg15"
-
-RDEPEND="${RDEPEND}
-	sys-apps/coreutils"
-
-
-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}
-
-	dodoc AUTHORS README ChangeLog
-}