diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-02-28 18:22:02 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-02-28 18:22:02 +0000 |
| commit | 20812db7754fc1c6e7c82d1ce8f50139e0a2ebdf (patch) | |
| tree | b3427ef650c8c99d8262d88ce07b69770330560e /net-print | |
| parent | Fix #356683 (diff) | |
| download | historical-20812db7754fc1c6e7c82d1ce8f50139e0a2ebdf.tar.gz historical-20812db7754fc1c6e7c82d1ce8f50139e0a2ebdf.tar.bz2 historical-20812db7754fc1c6e7c82d1ce8f50139e0a2ebdf.zip | |
Use virtual/jpeg.
Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/xpp/ChangeLog | 7 | ||||
| -rw-r--r-- | net-print/xpp/Manifest | 14 | ||||
| -rw-r--r-- | net-print/xpp/xpp-1.5.ebuild | 39 |
3 files changed, 27 insertions, 33 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/Manifest b/net-print/xpp/Manifest index 21a369ea1e1b..641535c1e2cb 100644 --- a/net-print/xpp/Manifest +++ b/net-print/xpp/Manifest @@ -1,18 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX cups.diff 1254 RMD160 9ea69ce980bc1734ecbfabb9ffb6561d742291f2 SHA1 f30caaf6bf822655070dbeed604ca5faae9aee11 SHA256 4f15d4d53af3b10f889a196503e6c013dc01f93662bd1958e46ef0d7b71a788f AUX inputslider.h.patch 622 RMD160 77f0ced592ddf6d77d806ffe1b8f87cd5339d47b SHA1 b823be889c91271012062e31cd1f55e895e407af SHA256 4a8babc92dc06d5aca33b4267c95b7e5cf5b83133a3d85744ce512836aa0dfd3 AUX xpp-gcc4.patch 495 RMD160 8ec96cb332954380a3040915a6748311ad6c0d7c SHA1 ecf24161a4b276f7fc36e88610be5351bf06360d SHA256 0a3af70845f496e929537d2ebe011291e98d34b15bc90d6b09d9920e6ec06267 AUX xpp-glibc-2.10.patch 368 RMD160 3327f4c12d525f5857cc67327d34f73c38e3f641 SHA1 e186e630873fb15a032572d61e20294e6175bd10 SHA256 072349dca84c0c956235e4f8c5d78d579da94be1dbdf2ea4a37bb2b9335b96ae DIST xpp-1.5.tar.gz 107755 RMD160 a64ec4c93013d1db08a6c9b6705b43850c36c337 SHA1 7f3c1427979516e47402a0acb708eb83b68daa61 SHA256 4d5b0c5467b10ababa4304c2fabf3f8cc7b715cc6a6a4844dc735bd7678a845d -EBUILD xpp-1.5.ebuild 983 RMD160 8ef6cf21d6c19eb9ee65b3f51497198e8c3de5f8 SHA1 71f45aeeb19b29c6a9e9cf0e4c60d93870095525 SHA256 eb50d961691aa4c279e798d585035583f5ffc5df610a24f7a17e9c4781a5b9f9 -MISC ChangeLog 3016 RMD160 93dbd2aff3115bf6f4ff1d471788dce05b5f1837 SHA1 d13983b16da8c2d546037fd9b92b323c4972a14f SHA256 cca81a1984c4ec7480fa58580165535d0d6156e49d959915ad6aeaecfdd19df2 +EBUILD xpp-1.5.ebuild 959 RMD160 662b0313774d2c6fd5bba2cd1bc4dea1f90b8f49 SHA1 8362f1755003b91767c60ce2262f51ad689f97b2 SHA256 77223ada335868bbb5b51302bd25d3c7e3c87ab94bd82b26d8a58b0223b08a85 +MISC ChangeLog 3107 RMD160 f3797b198b5b60a345a42508645a52a6f9c5f9ba SHA1 e4d573c929e8e59cc16c6a651314dd3b0869f7be SHA256 fad6c00f3e2de8066fc6c5c019bb7a5d8cc5df939d104b5ec3bb8521fcb3fca5 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.13 (GNU/Linux) - -iEYEARECAAYFAkspIEsACgkQAiZjviIA2Xi94QCg3kXKuSgq/Qt+vD8iC8+VWpJ8 -SMIAoO/1xhvSzxIYi/puqBJJpPhze8TT -=UXTy ------END PGP SIGNATURE----- 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 } |