summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2009-09-12 12:28:27 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2009-09-12 12:28:27 +0000
commitbf2e2cadd26347665867799259f475496449b638 (patch)
tree3afdd22e549daec1b7783ef9c5624dadea6c3b98 /media-gfx
parentfix HOMEPAGE (diff)
downloadhistorical-bf2e2cadd26347665867799259f475496449b638.tar.gz
historical-bf2e2cadd26347665867799259f475496449b638.tar.bz2
historical-bf2e2cadd26347665867799259f475496449b638.zip
Migrate to EAPI 2 so that we can switch from built_with_use to has_version.
Package-Manager: portage-2.2_rc40/cvs/Linux i686
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/splashutils/ChangeLog7
-rw-r--r--media-gfx/splashutils/Manifest10
-rw-r--r--media-gfx/splashutils/splashutils-1.5.4.3.ebuild15
3 files changed, 19 insertions, 13 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 426da0d8e163..1e9b429c1484 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/splashutils
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.162 2009/09/12 12:07:21 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.163 2009/09/12 12:28:27 betelgeuse Exp $
+
+ 12 Sep 2009; Petteri Räty <betelgeuse@gentoo.org>
+ splashutils-1.5.4.3.ebuild:
+ Migrate to EAPI 2 so that we can switch from built_with_use to
+ has_version.
12 Sep 2009; Petteri Räty <betelgeuse@gentoo.org>
-splashutils-1.5.4.2.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 31cc5f81d1e1..1f6d6eec483d 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -14,13 +14,13 @@ DIST miscsplashutils-0.1.8.tar.bz2 91997 RMD160 5efe2bfb8ae409d3e59e82b473454d94
DIST splashutils-gentoo-1.0.16.tar.bz2 15568 RMD160 f4831c381ac875b5bf9ad9ff527ae2e6cfd2b5d5 SHA1 6756807056c94f4dcc99f73489039dced6aecf4b SHA256 f9c51f442b5a638ac68a731925da57c3402d9506f160681fc01bf80e396d409d
DIST splashutils-lite-1.5.4.3.tar.bz2 426935 RMD160 e15b1c52d8c9c2886951fa7a674a9fc1707a0316 SHA1 943ffaae0b96305809ffb52f417a0fca2651a742 SHA256 3f21bd57ac67bd7426caa3ff5791d3609567db3bcd4319da29867ec42cadb362
DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
-EBUILD splashutils-1.5.4.3.ebuild 7400 RMD160 8d12b3c38be32c5abd539eeeae51aaa6f303c5b5 SHA1 20c84ff149d36cb6771cb09e35bee6fa313e6c3c SHA256 9b2406dae5351a588d78e5738a80e55367f9e8f6a0cc4b6ee2c7fa4f30e4c2a3
-MISC ChangeLog 30239 RMD160 9055ce2714957c63725bd3e4bee47658d0afbca8 SHA1 3c04fa18b4becf9560d3e804b4fe7e0d217f94b3 SHA256 33b84e9e6167729505b324e0453ade4a2f9417bb7aba064e46be1460df69925d
+EBUILD splashutils-1.5.4.3.ebuild 7433 RMD160 0f2bc46978c8383a567d27f09595ab63a1c33f58 SHA1 42ce9429b913a85db2b3bf0bc5a66b4f7e1bad64 SHA256 858d171e60e07070c60e52c5bbf75f3cadd9db648da8159604a24e20b7f9a10c
+MISC ChangeLog 30403 RMD160 212603d731db9aad4034cb2119ecf9fec6b36eed SHA1 1f1ba8cc975ee1a520b4f601420343a9eb4c785b SHA256 b42a3ddeac6451bc4055433795eaff7262550169d9285ffb757c17ddd2b697c3
MISC metadata.xml 311 RMD160 77b41213be37a5c0c7d5822d480ae11acc1af542 SHA1 34dbe221785f338326999be3fdabc0a29df8cf31 SHA256 d548d0cef598c99abeeba18f5308fe482651ebea18746195d86e53ba334f3392
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkqrjvoACgkQcxLzpIGCsLSHxQCePysMb8PsiMeXNSOowhZi2FSt
-FZ4AoJKp6qLu4REnTnsLafcHo6tHxvEu
-=qPSc
+iEYEARECAAYFAkqrk+cACgkQcxLzpIGCsLRUwQCfSACt3Qr+Nz3hXrpPh0cHkD1i
+ZhQAn29RF8W4plptJku8hp6Ly2uIuGRC
+=qiHt
-----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/splashutils-1.5.4.3.ebuild b/media-gfx/splashutils/splashutils-1.5.4.3.ebuild
index d19702c5d674..748d367805a6 100644
--- a/media-gfx/splashutils/splashutils-1.5.4.3.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.3.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3.ebuild,v 1.14 2009/05/31 14:19:34 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3.ebuild,v 1.15 2009/09/12 12:28:27 betelgeuse Exp $
-EAPI="1"
+EAPI="2"
inherit autotools eutils multilib toolchain-funcs
@@ -60,9 +60,7 @@ pkg_setup() {
fi
}
-src_unpack() {
- unpack ${A}
-
+src_prepare() {
mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs"
# We need to delete the Makefile and let it be rebuilt when splashutils
# is being configured. Either that, or we end up with a segfaulting kernel
@@ -72,7 +70,8 @@ src_unpack() {
cd "${S}"
ln -sf "${S}/src" "${WORKDIR}/core"
- if ! tc-is-cross-compiler && built_with_use sys-devel/gcc vanilla; then
+ if ! tc-is-cross-compiler && \
+ has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then
ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
ewarn "splashutils, you're on your own, as this configuration is not supported."
else
@@ -102,7 +101,7 @@ src_unpack() {
eautoreconf
}
-src_compile() {
+src_configure() {
tc-export CC
cd "${SM}"
emake CC="${CC}" LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"
@@ -120,7 +119,9 @@ src_compile() {
--with-lpng-src=${LPNGSRC} \
--with-zlib-src=${ZLIBSRC} \
--with-essential-libdir=/$(get_libdir) || die "failed to configure splashutils"
+}
+src_compile() {
emake CC="${CC}" STRIP="true" || die "failed to build splashutils"
if has_version ">=sys-apps/baselayout-1.13.99"; then