diff options
| author |   Mikle Kolyada <zlogene@gentoo.org> | 2014-05-20 12:10:10 +0000 |
|---|---|---|
| committer | Mikle Kolyada <zlogene@gentoo.org> | 2014-05-20 12:10:10 +0000 |
| commit | aff78bdc7e92cf131d572ee80a15d075761bb963 (patch) | |
| tree | 3852259255fa07cb32512b999e5c2509db1ff28c /dev-embedded | |
| parent | Marked ~hppa (bug #510626). (diff) | |
| download | gentoo-2-aff78bdc7e92cf131d572ee80a15d075761bb963.tar.gz gentoo-2-aff78bdc7e92cf131d572ee80a15d075761bb963.tar.bz2 gentoo-2-aff78bdc7e92cf131d572ee80a15d075761bb963.zip | |
Revision bump: EAPI=5; epatch_user; fix parallel make issue wrt bug #282244. Thanks to Sergey Popov.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xC42EB5D6)
Diffstat (limited to 'dev-embedded')
| -rw-r--r-- | dev-embedded/ponyprog/ChangeLog | 12 | ||||
| -rw-r--r-- | dev-embedded/ponyprog/files/ponyprog-2.07a-build.patch | 19 | ||||
| -rw-r--r-- | dev-embedded/ponyprog/ponyprog-2.07c-r1.ebuild | 63 |
3 files changed, 84 insertions, 10 deletions
diff --git a/dev-embedded/ponyprog/ChangeLog b/dev-embedded/ponyprog/ChangeLog index 63c425a81778..7411cc29d0f8 100644 --- a/dev-embedded/ponyprog/ChangeLog +++ b/dev-embedded/ponyprog/ChangeLog @@ -1,6 +1,13 @@ # 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.27 2010/10/08 03:53:27 vapier Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ChangeLog,v 1.28 2014/05/20 12:10:10 zlogene Exp $ + +*ponyprog-2.07c-r1 (20 May 2014) + + 20 May 2014; Mikle Kolyada <zlogene@gentoo.org> +ponyprog-2.07c-r1.ebuild, + files/ponyprog-2.07a-build.patch: + Revision bump: EAPI=5; epatch_user; fix parallel make issue wrt bug #282244. + Thanks to Sergey Popov. *ponyprog-2.07c (08 Oct 2010) @@ -101,4 +108,3 @@ 16 Mar 2004; Daniel Black <dragonheart@gentoo.org> ponyprog-2.06c.ebuild: Initial ebuild by Marco Testarmata <testarmata.marco@tiscali.it> in bug #43289 - diff --git a/dev-embedded/ponyprog/files/ponyprog-2.07a-build.patch b/dev-embedded/ponyprog/files/ponyprog-2.07a-build.patch index e9c7cb2d5d65..e8355008eac4 100644 --- a/dev-embedded/ponyprog/files/ponyprog-2.07a-build.patch +++ b/dev-embedded/ponyprog/files/ponyprog-2.07a-build.patch @@ -1,15 +1,20 @@ Respect LDFLAGS, CC, CXX -http://bugs.gentoo.org/show_bug.cgi?id=317767 +http://bugs.gentoo.org/317767 + +Fix parallel make + +https://bugs.gentoo.org/show_bug.cgi?id=282244 --- Makefile +++ Makefile @@ -331,7 +331,7 @@ prps: $(PRPS) - $(PROG): $(OBJS) +-$(PROG): $(OBJS) ++$(PROG): $(OBJS) vlib - $(CXX) -o $@ $(OBJS) $(LDFLAGS) -+ $(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS) ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS) %.o: %.cpp $(CXX) $(CFLAGS) -c $< -o $@ @@ -17,10 +22,10 @@ http://bugs.gentoo.org/show_bug.cgi?id=317767 +++ v/Config.mk @@ -35,8 +35,6 @@ #--------------------------------------------------------------------- - # Tools used in the makefile execution - #--------------------------------------------------------------------- --CC = gcc --CXX = g++ + #CC = gcc + #CXX = g++ +-CC = gcc-3.4 +-CXX = g++-3.4 #--------------------------------------------------------------------- # VPATH for dependencies on header files diff --git a/dev-embedded/ponyprog/ponyprog-2.07c-r1.ebuild b/dev-embedded/ponyprog/ponyprog-2.07c-r1.ebuild new file mode 100644 index 000000000000..380a5a018bec --- /dev/null +++ b/dev-embedded/ponyprog/ponyprog-2.07c-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.07c-r1.ebuild,v 1.1 2014/05/20 12:10:10 zlogene Exp $ + +EAPI="5" + +inherit eutils toolchain-funcs + +DESCRIPTION="Serial device programmer" +HOMEPAGE="http://www.lancos.com/ppwin95.html" +SRC_URI="mirror://sourceforge/${PN}/Pony_Prog2000-${PV}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + x11-libs/libXext + x11-libs/libX11 + x11-misc/xdg-utils" +DEPEND="${RDEPEND} + || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick )" + +S="${WORKDIR}/PonyProg2000-${PV}" + +src_prepare() { + sed -i -e '/CFLAGS/s:-O2::' v/Config.mk || die + sed -i -e '/include.*<asm\/io.h>/s:asm:sys:' *.cpp || die + sed -i -e 's/netscape/xdg-open/' e2cmdw.cpp || die + + convert ponyprog.ico ponyprog.png + + epatch \ + "${FILESDIR}/${PN}-2.07a-gcc43.patch" \ + "${FILESDIR}/${PN}-2.07c-build.patch" + epatch_user +} + +src_compile() { + tc-export CC CXX + # most of build is C++, but it uses CFLAGS + CFLAGS="${CXXFLAGS}" emake HOMEV="${S}/v" +} + +src_install() { + dobin bin/ponyprog2000 + 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." +} |