summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelo Arrifano <miknix@gentoo.org>2011-03-05 18:05:31 +0000
committerAngelo Arrifano <miknix@gentoo.org>2011-03-05 18:05:31 +0000
commitd8aaae08b3c6c7350aa2d71dd34d09e1395a6023 (patch)
treefcae82abd7e863e247e8f6dedbcb1946b6c03fb3 /gpe-base
parentppc64 stable wrt #354237 (diff)
downloadhistorical-d8aaae08b3c6c7350aa2d71dd34d09e1395a6023.tar.gz
historical-d8aaae08b3c6c7350aa2d71dd34d09e1395a6023.tar.bz2
historical-d8aaae08b3c6c7350aa2d71dd34d09e1395a6023.zip
Fixed hardcoded libdir in Makefile, use EAPI2
Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64
Diffstat (limited to 'gpe-base')
-rw-r--r--gpe-base/libdisplaymigration/ChangeLog6
-rw-r--r--gpe-base/libdisplaymigration/Manifest4
-rw-r--r--gpe-base/libdisplaymigration/libdisplaymigration-0.99.ebuild24
3 files changed, 21 insertions, 13 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/Manifest b/gpe-base/libdisplaymigration/Manifest
index 5192ca31aab5..3694bab754b9 100644
--- a/gpe-base/libdisplaymigration/Manifest
+++ b/gpe-base/libdisplaymigration/Manifest
@@ -1,4 +1,4 @@
DIST libdisplaymigration-0.99.tar.gz 5402 RMD160 5582a81148f9b6969369dc49781eb736551567a7 SHA1 225aa1fea7ab9d64cc81cb027819e0b23776777e SHA256 b0159537f22453fcf30d7c4d7d9a39b6996233217c1f80a49ede135cf6ed32ca
-EBUILD libdisplaymigration-0.99.ebuild 675 RMD160 0521d2ed27399d5ba629bca497c64ed952a81948 SHA1 e649c7cf4d3b2e6981ebe44de026cb8996deaae3 SHA256 484f3f7325165b0589d49dfaaca0c233de353ff466c5f7e0300daa80362e6035
-MISC ChangeLog 554 RMD160 ff2679ee23e4a85c4a819df1410735f9c5d31afa SHA1 9bfb519083dc66e4d53bec86f82010e5fed6c47c SHA256 92f1322f3fd9d9d97dd25b3726d63f0d3cd3a9069f1318590ff939a8520b6db3
+EBUILD libdisplaymigration-0.99.ebuild 831 RMD160 8bfb2b78378e67aa2da356b75e3413e727832a49 SHA1 3573c8bf1fade00f28674c6c5c10f9c451558ce7 SHA256 b5dae7ed077a24b6ce5be64e4b66bf7e2ea62bf521bc90fc8c4de3c1b0af7939
+MISC ChangeLog 689 RMD160 6cac6f63f61a1f333a3decf4192110b13743f030 SHA1 41d66a3c38f19fcedf5324cc67a169af1ed98747 SHA256 d9962081a28d35cde562dccf0c775b1ae139dd71e33e004de408b35374fef4a8
MISC metadata.xml 214 RMD160 bca5b2208a68a7a7a84355f818a615e04dcb3ca8 SHA1 d0f048fbc4c361e89505f6edb1ddda27bbc7d73e SHA256 7b5eab127a5e896980df3a9aa01494e608a8a701ae9c5478255bff89d46410af
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
}