diff options
| author |   Angelo Arrifano <miknix@gentoo.org> | 2011-03-05 18:05:31 +0000 |
|---|---|---|
| committer | Angelo Arrifano <miknix@gentoo.org> | 2011-03-05 18:05:31 +0000 |
| commit | 878b6e37c93b1df74c2002a9e757ef0dfbf1f309 (patch) | |
| tree | 647be0b59f29a14519133ee8ce032f51233836fb /gpe-base | |
| parent | ppc64 stable wrt #354237 (diff) | |
| download | gentoo-2-878b6e37c93b1df74c2002a9e757ef0dfbf1f309.tar.gz gentoo-2-878b6e37c93b1df74c2002a9e757ef0dfbf1f309.tar.bz2 gentoo-2-878b6e37c93b1df74c2002a9e757ef0dfbf1f309.zip | |
Fixed hardcoded libdir in Makefile, use EAPI2
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Diffstat (limited to 'gpe-base')
| -rw-r--r-- | gpe-base/libdisplaymigration/ChangeLog | 6 | ||||
| -rw-r--r-- | gpe-base/libdisplaymigration/libdisplaymigration-0.99.ebuild | 24 |
2 files changed, 19 insertions, 11 deletions
diff --git a/gpe-base/libdisplaymigration/ChangeLog b/gpe-base/libdisplaymigration/ChangeLog index b7ef38ce957f..f3ffb50823b4 100644 --- a/gpe-base/libdisplaymigration/ChangeLog +++ b/gpe-base/libdisplaymigration/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gpe-base/libdisplaymigration # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gpe-base/libdisplaymigration/ChangeLog,v 1.2 2011/03/05 17:50:06 miknix Exp $ +# $Header: /var/cvsroot/gentoo-x86/gpe-base/libdisplaymigration/ChangeLog,v 1.3 2011/03/05 18:05:31 miknix Exp $ + + 05 Mar 2011; Angelo Arrifano <miknix@gentoo.org> + libdisplaymigration-0.99.ebuild: + Fixed hardcoded libdir in Makefile, use EAPI2 05 Mar 2011; Angelo Arrifano <miknix@gentoo.org> libdisplaymigration-0.99.ebuild: diff --git a/gpe-base/libdisplaymigration/libdisplaymigration-0.99.ebuild b/gpe-base/libdisplaymigration/libdisplaymigration-0.99.ebuild index 5bc5aeb6a673..6d15e5129a4f 100644 --- a/gpe-base/libdisplaymigration/libdisplaymigration-0.99.ebuild +++ b/gpe-base/libdisplaymigration/libdisplaymigration-0.99.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gpe-base/libdisplaymigration/libdisplaymigration-0.99.ebuild,v 1.2 2011/03/05 17:50:06 miknix Exp $ +# $Header: /var/cvsroot/gentoo-x86/gpe-base/libdisplaymigration/libdisplaymigration-0.99.ebuild,v 1.3 2011/03/05 18:05:31 miknix Exp $ -EAPI="1" +EAPI="2" inherit gpe @@ -14,11 +14,6 @@ KEYWORDS="~arm ~amd64 ~x86" IUSE="${IUSE}" GPE_DOCS="" -src_install() { - gpe_src_install "$@" - make DESTDIR="${D}" PREFIX=/usr install-devel -} - RDEPEND="${RDEPEND} x11-libs/gtk+:2 >=dev-libs/libgcrypt-1.2.1" @@ -26,8 +21,17 @@ RDEPEND="${RDEPEND} DEPEND="${DEPEND} ${RDEPEND}" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { + gpe_src_prepare + + # Let the PM handle strip sed -i -e s/'install -s'/'install'/ Makefile || die + # Fix for passing multilib checks + sed -i -e 's@$(PREFIX)/lib@$(PREFIX)/'"$(get_libdir)@g" Makefile \ + || die "Cannot sed Makefile" +} + +src_install() { + gpe_src_install "$@" + make DESTDIR="${D}" PREFIX=/usr install-devel } |