amd64 stable wrt #300418

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 9 insertions, 88 deletions

diff --git a/dev-embedded/ponyprog/ChangeLog b/dev-embedded/ponyprog/ChangeLog
index fe381c9e78d2..1b3b2b38d300 100644
--- a/dev-embedded/ponyprog/ChangeLog
+++ b/dev-embedded/ponyprog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-embedded/ponyprog
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ChangeLog,v 1.22 2010/04/09 21:58:52 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ChangeLog,v 1.23 2010/04/29 12:43:25 ssuominen Exp $
+
+  29 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+  ponyprog-2.07a-r1.ebuild:
+  amd64 stable wrt #300418
 
   09 Apr 2010; Denis Dupeyron <calchan@gentoo.org> ponyprog-2.07a-r1.ebuild:
   Removed some last seamonkey remains, thanks to Lars Wendler.
diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest
index af2b806f4408..8696e993eddc 100644
--- a/dev-embedded/ponyprog/Manifest
+++ b/dev-embedded/ponyprog/Manifest
@@ -1,6 +1,5 @@
 AUX ponyprog-2.07a-gcc43.patch 1397 RMD160 a52c4b174e1153ac460835a70142d5455c61a6a1 SHA1 a94b03da2e520e6f8f66f7ef4e91702be73d038c SHA256 01f343ae01fe0fca6979318f933d8faf7cd1942beaa859b2c29dc655e808c08f
 DIST PonyProg2000-2.07a.tar.gz 680770 RMD160 b9604e23c5e7dd703a80688dff425b59e72e6e14 SHA1 60094c996c7956bee81e5dec06445e8760bb4e35 SHA256 6398fcbe15a0ea93f6f38a3ad7299f5b46ba09d2f97050f386e27f19a3283436
-EBUILD ponyprog-2.07a-r1.ebuild 2003 RMD160 c340bf440e4c7c08fc4409b9dffaf1309f8dbff3 SHA1 deff650bad0f44bcda9d8b5a2cc7b8f3436aca33 SHA256 d4fdf2924fd28971b298c397822bd55c5af306c2d115bb1bccd6e098077dbdc4
-EBUILD ponyprog-2.07a.ebuild 2205 RMD160 6ac9d563818188228c4793026b3574205cbddcac SHA1 0ea1cb9efe8139dba21f6c3eb4541f4da863352e SHA256 1d7f98e32ee930683b361a3348ca773e75226616f13f224b43c079b7913b9235
-MISC ChangeLog 2917 RMD160 b6d800b300743a21c67b4ed2b2c08dee5d725442 SHA1 98a2372be026dbccdeff08b3f49f671228cbd0a4 SHA256 49679faf2c436aa5b6f6048094bfc8df5984cdec82cf8527f458fab339b33f20
+EBUILD ponyprog-2.07a-r1.ebuild 2004 RMD160 47d6705a00f9cf1a238d7df802b1322d7808a463 SHA1 fa6062e09dff750b41094c47b88f3ac63231821a SHA256 1fe7729985c489c70a453da17d4598bef482ad9b52ed3932f4a7ac22611b91eb
+MISC ChangeLog 3029 RMD160 9c9c7748a4dba16d469e770acb39911a13214cce SHA1 808261a3ac33810e94ba5b6f732ad244342ceb5c SHA256 3dac673e0d37661321b4c4bb7f27c97a7290fc900fef4169c9c9fc08ef3228fc
 MISC metadata.xml 382 RMD160 e6bbce500b6f5e7d4476a6abae45403275e7a20b SHA1 eb550361c0bf337db4074b5f44c9fd463bcaec59 SHA256 aaedb0b1e1bb1093f7e221f35e25af1d263cbfb16d8cf108568902119ba9e22c
diff --git a/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild b/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild
index 379e99bc8d82..4e35a97919c1 100644
--- a/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild
+++ b/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild,v 1.3 2010/04/09 21:58:52 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild,v 1.4 2010/04/29 12:43:25 ssuominen Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/PonyProg2000-${PV}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="epiphany firefox"
 
 RDEPEND="x11-libs/libXaw
diff --git a/dev-embedded/ponyprog/ponyprog-2.07a.ebuild b/dev-embedded/ponyprog/ponyprog-2.07a.ebuild
deleted file mode 100644
index 4305d5ccecc5..000000000000
--- a/dev-embedded/ponyprog/ponyprog-2.07a.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.07a.ebuild,v 1.8 2010/01/01 17:58:10 scarabeus Exp $
-
-inherit eutils
-
-DESCRIPTION="Serial device programmer"
-HOMEPAGE="http://www.lancos.com/ppwin95.html"
-SRC_URI="mirror://sourceforge/${PN}/PonyProg2000-${PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="epiphany firefox seamonkey"
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libX11
-	epiphany? ( www-client/epiphany )
-	firefox? ( || ( www-client/mozilla-firefox www-client/firefox-bin ) )
-	seamonkey? ( || ( www-client/seamonkey www-client/seamonkey-bin ) )"
-DEPEND="${RDEPEND}
-	media-gfx/imagemagick"
-
-S="${WORKDIR}/PonyProg2000-${PV}"
-
-pkg_setup() {
-	if (use epiphany && use firefox) || (use epiphany && use seamonkey) || (use firefox && use seamonkey) ; then
-		die "Only one of epiphany, firefox or seamonkey can be in USE."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e "s:\$(HOME)/Progetti/PonyProg_Sourceforge/v:${S}/v:" \
-		-e 's/\-O2//' \
-		v/Config.mk || die "sed failed"
-
-	sed -i -e 's/<asm\/io.h>/<sys\/io.h>/' *.cpp || die "sed failed"
-
-	if use epiphany ; then
-		sed -i -e 's/netscape/epiphany/' e2cmdw.cpp
-	fi
-	if use firefox ; then
-		sed -i -e 's/netscape/firefox/' e2cmdw.cpp
-	fi
-	if use seamonkey ; then
-		sed -i -e 's/netscape/seamonkey/' e2cmdw.cpp
-	fi
-	convert ponyprog.ico ponyprog.png
-
-	# Fix compilation with gcc-4.3, bug #227503
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-}
-
-src_compile() {
-	# bug #282244
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dobin bin/ponyprog2000 || die
-	keepdir /var/lock/uucp
-	fowners uucp:uucp /var/lock/uucp
-	fperms 755 /var/lock/uucp
-	doicon ponyprog.png
-	make_desktop_entry ponyprog2000 PonyProg2000 ponyprog
-}
-
-pkg_postinst() {
-	elog "To use the COM port in user mode (not as root), you need to"
-	elog "be in the 'uucp' group."
-	elog
-	elog "To use the LPT port in user mode (not as root) you need a kernel with"
-	elog "ppdev, parport and parport_pc compiled in or as modules. You need the"
-	elog "rights to write to /dev/parport? devices."
-}