| 1 |
ssuominen 11/02/28 18:22:02 |
| 2 |
|
| 3 |
Modified: ChangeLog xpp-1.5.ebuild |
| 4 |
Log: |
| 5 |
Use virtual/jpeg. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.22 net-print/xpp/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/xpp/ChangeLog?rev=1.22&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/xpp/ChangeLog?rev=1.22&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/xpp/ChangeLog?r1=1.21&r2=1.22 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v |
| 19 |
retrieving revision 1.21 |
| 20 |
retrieving revision 1.22 |
| 21 |
diff -u -r1.21 -r1.22 |
| 22 |
--- ChangeLog 16 Dec 2009 18:00:44 -0000 1.21 |
| 23 |
+++ ChangeLog 28 Feb 2011 18:22:02 -0000 1.22 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for net-print/xpp |
| 26 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.21 2009/12/16 18:00:44 flameeyes Exp $ |
| 28 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.22 2011/02/28 18:22:02 ssuominen Exp $ |
| 30 |
+ |
| 31 |
+ 28 Feb 2011; Samuli Suominen <ssuominen@g.o> xpp-1.5.ebuild: |
| 32 |
+ Use virtual/jpeg. |
| 33 |
|
| 34 |
16 Dec 2009; Diego E. Pettenò <flameeyes@g.o> xpp-1.5.ebuild: |
| 35 |
Use emake -j1 for build, bug #297200. |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.10 net-print/xpp/xpp-1.5.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/xpp/xpp-1.5.ebuild?rev=1.10&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/xpp/xpp-1.5.ebuild?rev=1.10&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/xpp/xpp-1.5.ebuild?r1=1.9&r2=1.10 |
| 44 |
|
| 45 |
Index: xpp-1.5.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.5.ebuild,v |
| 48 |
retrieving revision 1.9 |
| 49 |
retrieving revision 1.10 |
| 50 |
diff -u -r1.9 -r1.10 |
| 51 |
--- xpp-1.5.ebuild 16 Dec 2009 18:00:44 -0000 1.9 |
| 52 |
+++ xpp-1.5.ebuild 28 Feb 2011 18:22:02 -0000 1.10 |
| 53 |
@@ -1,47 +1,48 @@ |
| 54 |
-# Copyright 1999-2009 Gentoo Foundation |
| 55 |
+# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.5.ebuild,v 1.9 2009/12/16 18:00:44 flameeyes Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.5.ebuild,v 1.10 2011/02/28 18:22:02 ssuominen Exp $ |
| 59 |
|
| 60 |
-EAPI="1" |
| 61 |
-inherit eutils |
| 62 |
+EAPI=2 |
| 63 |
+inherit eutils toolchain-funcs |
| 64 |
|
| 65 |
DESCRIPTION="X Printing Panel" |
| 66 |
SRC_URI="mirror://sourceforge/cups/${P}.tar.gz" |
| 67 |
HOMEPAGE="http://cups.sourceforge.net/xpp/" |
| 68 |
|
| 69 |
-KEYWORDS="x86 amd64 ~ppc" |
| 70 |
-IUSE="" |
| 71 |
-SLOT="0" |
| 72 |
LICENSE="GPL-2" |
| 73 |
+SLOT="0" |
| 74 |
+KEYWORDS="amd64 ~ppc x86" |
| 75 |
+IUSE="" |
| 76 |
|
| 77 |
-DEPEND=">=net-print/cups-1.1.14 |
| 78 |
+RDEPEND=">=net-print/cups-1.1.14 |
| 79 |
x11-libs/fltk:1.1 |
| 80 |
- media-libs/jpeg |
| 81 |
+ virtual/jpeg |
| 82 |
media-libs/libpng |
| 83 |
sys-libs/zlib |
| 84 |
x11-libs/libX11 |
| 85 |
x11-libs/libXext |
| 86 |
x11-libs/libXft" |
| 87 |
+DEPEND="${RDEPEND}" |
| 88 |
|
| 89 |
-src_unpack() { |
| 90 |
- unpack ${A} |
| 91 |
- cd "${S}" |
| 92 |
- epatch "${FILESDIR}"/xpp-gcc4.patch \ |
| 93 |
+src_prepare() { |
| 94 |
+ epatch \ |
| 95 |
+ "${FILESDIR}"/xpp-gcc4.patch \ |
| 96 |
"${FILESDIR}"/xpp-glibc-2.10.patch |
| 97 |
} |
| 98 |
|
| 99 |
-src_compile() { |
| 100 |
- export CXX=g++ |
| 101 |
+src_configure() { |
| 102 |
+ export CXX="$(tc-getCXX)" |
| 103 |
export LDFLAGS="-L/usr/lib/fltk-1.1 -lfltk" |
| 104 |
export CPPFLAGS="-I/usr/include/fltk-1.1" |
| 105 |
|
| 106 |
- econf || die "configure failed" |
| 107 |
+ econf |
| 108 |
+} |
| 109 |
|
| 110 |
- # bug #297200 |
| 111 |
- emake -j1 || die "make failed" |
| 112 |
+src_compile() { |
| 113 |
+ emake -j1 || die #297200 |
| 114 |
} |
| 115 |
|
| 116 |
src_install() { |
| 117 |
- einstall || die "make install failed" |
| 118 |
+ einstall || die |
| 119 |
dodoc ChangeLog README |
| 120 |
} |
Archives