Make the 1.0.3-r1 actually emerge and punt older.

(Portage version: 2.2.0_alpha75/cvs/Linux x86_64)

5 files changed, 8 insertions, 95 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/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
-}