summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2010-06-28 11:40:00 +0000
committerChristian Faulhammer <fauli@gentoo.org>2010-06-28 11:40:00 +0000
commit71d93eb8d321fb02f4c7e5a17b670c4ff239e116 (patch)
treee7473f8545bff10fc8dd0c2d6e3d471a199f9d98 /app-misc/alexandria
parentqtcurve-qt4: version bump (diff)
downloadgentoo-2-71d93eb8d321fb02f4c7e5a17b670c4ff239e116.tar.gz
gentoo-2-71d93eb8d321fb02f4c7e5a17b670c4ff239e116.tar.bz2
gentoo-2-71d93eb8d321fb02f4c7e5a17b670c4ff239e116.zip
replace the workaround for installation with a proper fix by using the build system
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'app-misc/alexandria')
-rw-r--r--app-misc/alexandria/ChangeLog7
-rw-r--r--app-misc/alexandria/alexandria-0.6.6-r1.ebuild8
-rw-r--r--app-misc/alexandria/alexandria-0.6.6.ebuild8
3 files changed, 12 insertions, 11 deletions
diff --git a/app-misc/alexandria/ChangeLog b/app-misc/alexandria/ChangeLog
index 2312cedcd44e..06d52453bcf3 100644
--- a/app-misc/alexandria/ChangeLog
+++ b/app-misc/alexandria/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-misc/alexandria
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/ChangeLog,v 1.39 2010/06/25 21:30:09 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/ChangeLog,v 1.40 2010/06/28 11:40:00 fauli Exp $
+
+ 28 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
+ alexandria-0.6.6.ebuild, alexandria-0.6.6-r1.ebuild:
+ replace the workaround for installation with a proper fix by using the
+ build system
*alexandria-0.6.6-r1 (25 Jun 2010)
diff --git a/app-misc/alexandria/alexandria-0.6.6-r1.ebuild b/app-misc/alexandria/alexandria-0.6.6-r1.ebuild
index 7b1c90f7b68a..63c187841ee9 100644
--- a/app-misc/alexandria/alexandria-0.6.6-r1.ebuild
+++ b/app-misc/alexandria/alexandria-0.6.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/alexandria-0.6.6-r1.ebuild,v 1.1 2010/06/25 21:30:09 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/alexandria-0.6.6-r1.ebuild,v 1.2 2010/06/28 11:40:00 fauli Exp $
EAPI=2
USE_RUBY="ruby18"
@@ -40,10 +40,8 @@ each_ruby_compile() {
}
each_ruby_install() {
- export PREFIX="${D}/usr"
- # Prevent regeneration of config.rb with wrongly set path entries
- sed -e 's:lib/alexandria/config.rb:tempfile:' -i Rakefile || die
- ${RUBY} -S rake install || die
+ export DESTDIR="${D}" PREFIX=/usr
+ rake install_package_staging || die
}
all_ruby_install() {
diff --git a/app-misc/alexandria/alexandria-0.6.6.ebuild b/app-misc/alexandria/alexandria-0.6.6.ebuild
index a4e32c2d6f25..d0a7fe455416 100644
--- a/app-misc/alexandria/alexandria-0.6.6.ebuild
+++ b/app-misc/alexandria/alexandria-0.6.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/alexandria-0.6.6.ebuild,v 1.2 2010/06/25 08:38:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/alexandria/alexandria-0.6.6.ebuild,v 1.3 2010/06/28 11:40:00 fauli Exp $
inherit gnome2 ruby
@@ -37,10 +37,8 @@ src_compile() {
}
src_install() {
- export PREFIX="${D}/usr"
- # Prevent regeneration of config.rb with wrongly set path entries
- sed -e 's:lib/alexandria/config.rb:tempfile:' -i Rakefile || die
- rake install || die
+ export DESTDIR="${D}" PREFIX=/usr
+ rake install_package_staging || die
[ -n "${DOCS}" ] && dodoc ${DOCS}