Make the 1.0.3-r1 actually emerge and punt older.

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

6 files changed, 30 insertions, 102 deletions

diff --git a/app-misc/g15macro/ChangeLog b/app-misc/g15macro/ChangeLog
index d3b0bf4ebb1c..c6b73c577208 100644
--- a/app-misc/g15macro/ChangeLog
+++ b/app-misc/g15macro/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/g15macro
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15macro/ChangeLog,v 1.8 2011/11/16 21:43:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15macro/ChangeLog,v 1.9 2011/11/17 11:31:36 scarabeus Exp $
+
+  17 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org> -g15macro-1.0.0.ebuild,
+  -g15macro-1.0.1.ebuild, -g15macro-1.0.3.ebuild, g15macro-1.0.3-r1.ebuild:
+  Make the 1.0.3-r1 actually emerge and punt older.
 
 *g15macro-1.0.3-r1 (16 Nov 2011)
 
diff --git a/app-misc/g15macro/Manifest b/app-misc/g15macro/Manifest
index 64b32e0cbaf0..6ed65d45d2e3 100644
--- a/app-misc/g15macro/Manifest
+++ b/app-misc/g15macro/Manifest
@@ -1,9 +1,24 @@
-DIST g15macro-1.0.0.tar.bz2 223563 RMD160 69627bcee91ab0e7cefcf861288d545e8b314253 SHA1 7545067405a54e213d6d26fdd3e4f57a59b4b894 SHA256 f77a5ee0d07e15431353012793533784cb46d7fdeab78a68ceaaf2232672f77d
-DIST g15macro-1.0.1.tar.gz 321459 RMD160 8adefc901d9b740f0ec670a68408813324f018a3 SHA1 b31b569bbfc9522438bb84a0ad8f437e91562807 SHA256 1d94911d5da6881fef1e6071d233533b4a3fe9b146c1a1566fdf6155a54ba51e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST g15macro-1.0.3.tar.gz 324859 RMD160 f96fb40e7b055b8d66eb0dfcfded3fec5a264803 SHA1 fa6758665f042c37bc1a27cf6a7cb4cf2e05dc2f SHA256 be4a5ba422777b330d09169fe505eae433aad7378c2eaf411ea591723b82ace2
-EBUILD g15macro-1.0.0.ebuild 763 RMD160 1b50fe857f00048212284decdd0952165bd02579 SHA1 1b974fe62f6edfcc73790d53bc6180731bd233f2 SHA256 9ee27fc3e61c9bc4e6da9405c9b9369dddd7b395a976fbadb53067f1baa9a3dc
-EBUILD g15macro-1.0.1.ebuild 764 RMD160 97c08f389298f8792ac27ce1baa9c051a696977b SHA1 9830f01c9c432f42c814608d6b077874548c1682 SHA256 2676aef230d8e28ee32c34a458a44ab1c6cc7a40da1b14b8df7f884752344692
-EBUILD g15macro-1.0.3-r1.ebuild 817 RMD160 6a6a90ba1d6eaa4963214fc5c6c9592263c4d5e9 SHA1 1a1555fb235599f6b95b00421995b7b90d8e2616 SHA256 90531e1358dbca6a78526cd7a66a47aedd57f9d59e8ea4375f13dc000aa0cb84
-EBUILD g15macro-1.0.3.ebuild 764 RMD160 5a38549b0e8b63cf3775dd5e4a416a2278d1cd6c SHA1 7394de342d05a69a185798f38f8bab4ec884c775 SHA256 00f981d7f086ef9ff196301dc849f392b3fb1b0555de5d9618110455ebe710ee
-MISC ChangeLog 1241 RMD160 946b509c62576ddc4c7ccd6e49237e2684a0a059 SHA1 3cc5cf1a10e21b090998bda6e577e3d611f17a7c SHA256 b1484b40722f9e9688f703b8e7071a32ec1956505db04dbf19f7c5ed2e7bf97b
+EBUILD g15macro-1.0.3-r1.ebuild 807 RMD160 659408a0737fcb33ab3e00364ff651c976149d30 SHA1 d73d812712d85f8dfefc6be09438bbbe6bfb13ea SHA256 add1eef62d21964ac35b514845ef80135e4e4f0064dc41f4d35d60371d9b03f2
+MISC ChangeLog 1451 RMD160 31f8f399736219ac8e5eab5d14c024f6c23a2a26 SHA1 8fc8bb703ba6174d1750be0805e2b3daa8b716b3 SHA256 1fe0a26770dd6bf6599902bf9de8fd94befd61f62bd4088dcc1c4e62dabda0e4
 MISC metadata.xml 222 RMD160 f3b76907c0789c67d2e3d9d4073a5911aa8ae42f SHA1 792ac055d4a27ee4d9120df34d5390ac3732ab94 SHA256 edd5f0f934fb8e9338e5a0ce8caaae6f6232dfb8cb4e0c0cfbac0363eb42b7c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOxPChAAoJEOSiRoyO7jvoE14P/0zkyO96AtDxLDQD25PXpgF4
+jDksd1G4tzeRql8dfkqJQDBocMdQMJ5Xfoi3wQZF9Fp0iPtM/0uEQfRyqIFBagIE
++Twfdc/u7yiEXpAMI1La/McjSzhr6nBIrEAC8bBBtY2jV9k7KJxJ4IdkW91DRqRU
+3s4rvFrvBfJquAc+tIw19SDYMAMxuB4lNUR69soerxJ6zYUPbv7JDpExEQW0aaMh
+AxBMvaDFtRVrUEs80zlMOaHz6HYlw25KtWD5MIZI6kXbLIRQIzPaz9IDM868557z
+duj/aHSVK5pALVPGMJutKdzfKl5QdPmPJgf/+5EY+r/NvfRj8QRgk1R4BCGscZo5
+EuKApU2ih2PkNAuE8l2fJtmp0ztPGZ/85kE13e+XvcDnqUv8e1FD54lZ2IuGEbUf
+FCafN9ECxmoGyzY5kAZaXbxUGTQt5dUJG/KQA7Ave2ked0hLj5TkqPHTOE7db3oA
+ANRLTf3dImL10OaA49BdQo3P8/AZJWrAKneYZF4tsTSRsQuuzNLNcY3opZp0EtIK
+eL2glbWpd94xzRA+4EMGqH04/LbqPjylvw5LwQ0AE6+gya4GHBbHN04YGfHH8FDy
+ToAz09tPJm039/vIsDIzKYesoe99NoEWiA51E/v++4PgL+q+bk+rKQejKKz2+75t
+SXYmxhWFwT0HgJKouXo1
+=9dLV
+-----END PGP SIGNATURE-----
diff --git a/app-misc/g15macro/g15macro-1.0.0.ebuild b/app-misc/g15macro/g15macro-1.0.0.ebuild
deleted file mode 100644
index 1fb2a16e99f1..000000000000
--- a/app-misc/g15macro/g15macro-1.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15macro/g15macro-1.0.0.ebuild,v 1.3 2008/02/21 23:53:22 robbat2 Exp $
-
-DESCRIPTION="Macro recording plugin to G15daemon"
-HOMEPAGE="http://g15daemon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=app-misc/g15daemon-1.9.0
-	dev-libs/libg15
-	dev-libs/libg15render
-	x11-libs/libX11
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-libs/libXtst"
-
-RDEPEND="${DEPEND}
-	sys-libs/zlib"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	rm "$D"/usr/share/doc/${P}/{COPYING,NEWS}
-
-	prepalldocs
-}
diff --git a/app-misc/g15macro/g15macro-1.0.1.ebuild b/app-misc/g15macro/g15macro-1.0.1.ebuild
deleted file mode 100644
index 749db5146c08..000000000000
--- a/app-misc/g15macro/g15macro-1.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15macro/g15macro-1.0.1.ebuild,v 1.2 2008/02/21 23:53:22 robbat2 Exp $
-
-DESCRIPTION="Macro recording plugin to G15daemon"
-HOMEPAGE="http://g15daemon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=app-misc/g15daemon-1.9.0
-	dev-libs/libg15
-	dev-libs/libg15render
-	x11-libs/libX11
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-libs/libXtst"
-
-RDEPEND="${DEPEND}
-	sys-libs/zlib"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	rm "${D}"/usr/share/doc/${P}/{COPYING,NEWS}
-
-	prepalldocs
-}
diff --git a/app-misc/g15macro/g15macro-1.0.3-r1.ebuild b/app-misc/g15macro/g15macro-1.0.3-r1.ebuild
index fbd23aff27ac..d4344672d378 100644
--- a/app-misc/g15macro/g15macro-1.0.3-r1.ebuild
+++ b/app-misc/g15macro/g15macro-1.0.3-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15macro/g15macro-1.0.3-r1.ebuild,v 1.1 2011/11/16 21:43:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15macro/g15macro-1.0.3-r1.ebuild,v 1.2 2011/11/17 11:31:36 scarabeus Exp $
 
 EAPI=4
+
 DESCRIPTION="Macro recording plugin to G15daemon"
 HOMEPAGE="http://g15daemon.sourceforge.net/"
 SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.gz"
@@ -29,7 +30,5 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
-	rm "${D}"/usr/share/doc/${P}/{COPYING,NEWS}
-
-	prepalldocs
+	rm "${ED}"/usr/share/doc/${P}/{COPYING,NEWS}
 }
diff --git a/app-misc/g15macro/g15macro-1.0.3.ebuild b/app-misc/g15macro/g15macro-1.0.3.ebuild
deleted file mode 100644
index 29a02d3669d1..000000000000
--- a/app-misc/g15macro/g15macro-1.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15macro/g15macro-1.0.3.ebuild,v 1.1 2008/09/13 22:35:35 robbat2 Exp $
-
-DESCRIPTION="Macro recording plugin to G15daemon"
-HOMEPAGE="http://g15daemon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=app-misc/g15daemon-1.9.0
-	dev-libs/libg15
-	dev-libs/libg15render
-	x11-libs/libX11
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-libs/libXtst"
-
-RDEPEND="${DEPEND}
-	sys-libs/zlib"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	rm "${D}"/usr/share/doc/${P}/{COPYING,NEWS}
-
-	prepalldocs
-}