diff options
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/xpp/ChangeLog | 7 | ||||
| -rw-r--r-- | net-print/xpp/xpp-1.5.ebuild | 39 |
2 files changed, 25 insertions, 21 deletions
diff --git a/net-print/xpp/ChangeLog b/net-print/xpp/ChangeLog index ea2d261ffb83..e40ee746b831 100644 --- a/net-print/xpp/ChangeLog +++ b/net-print/xpp/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-print/xpp -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.21 2009/12/16 18:00:44 flameeyes Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.22 2011/02/28 18:22:02 ssuominen Exp $ + + 28 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> xpp-1.5.ebuild: + Use virtual/jpeg. 16 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> xpp-1.5.ebuild: Use emake -j1 for build, bug #297200. diff --git a/net-print/xpp/xpp-1.5.ebuild b/net-print/xpp/xpp-1.5.ebuild index 0a252a3376d9..fe8343616c98 100644 --- a/net-print/xpp/xpp-1.5.ebuild +++ b/net-print/xpp/xpp-1.5.ebuild @@ -1,47 +1,48 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.5.ebuild,v 1.9 2009/12/16 18:00:44 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.5.ebuild,v 1.10 2011/02/28 18:22:02 ssuominen Exp $ -EAPI="1" -inherit eutils +EAPI=2 +inherit eutils toolchain-funcs DESCRIPTION="X Printing Panel" SRC_URI="mirror://sourceforge/cups/${P}.tar.gz" HOMEPAGE="http://cups.sourceforge.net/xpp/" -KEYWORDS="x86 amd64 ~ppc" -IUSE="" -SLOT="0" LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="" -DEPEND=">=net-print/cups-1.1.14 +RDEPEND=">=net-print/cups-1.1.14 x11-libs/fltk:1.1 - media-libs/jpeg + virtual/jpeg media-libs/libpng sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXft" +DEPEND="${RDEPEND}" -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/xpp-gcc4.patch \ +src_prepare() { + epatch \ + "${FILESDIR}"/xpp-gcc4.patch \ "${FILESDIR}"/xpp-glibc-2.10.patch } -src_compile() { - export CXX=g++ +src_configure() { + export CXX="$(tc-getCXX)" export LDFLAGS="-L/usr/lib/fltk-1.1 -lfltk" export CPPFLAGS="-I/usr/include/fltk-1.1" - econf || die "configure failed" + econf +} - # bug #297200 - emake -j1 || die "make failed" +src_compile() { + emake -j1 || die #297200 } src_install() { - einstall || die "make install failed" + einstall || die dodoc ChangeLog README } |