replace the workaround for installation with a proper fix by using the build system

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 19 insertions, 18 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/Manifest b/app-misc/alexandria/Manifest
index eadc1c955d19..2523c93fb41e 100644
--- a/app-misc/alexandria/Manifest
+++ b/app-misc/alexandria/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX alexandria-0.6.6-Rakefile.patch 509 RMD160 1433786000f4fadd054dbb411d6da4ddbe6c7924 SHA1 d71853c608312f9a73ef7c13a0e0adfc2e0dadd7 SHA256 5d29b2edc0891f2707a2eae0f8e6236c1c1e04f3d48d34a0a645abe275619cc9
 AUX alexandria-rakefile.patch 447 RMD160 0e091640e3666f23b574834d976c0649a5124067 SHA1 5abfcb997c95d0a08d1401df4151dfe25aada1da SHA256 88852e3f4bb5e4edb40b6e89609aeb91dddbed7886fbfed5a52fb8112e888416
 DIST alexandria-0.6.5.tar.gz 2970519 RMD160 a70622e29c898a11f44454508e9c19f81415ae6f SHA1 4d7bd3b75444c2132566f5d7257996199f5c2677 SHA256 ecfd78c9be3cfe4c2a5732425ceb8f19fbc95a123f9a13fc36717f2b16ca358f
 DIST alexandria-0.6.6.tar.gz 2990953 RMD160 a935205782caafff990a859f548eec81eba4ba63 SHA1 edcd808ab2fd7407bfbacdd8ecd7f0346e871b1d SHA256 42a9c81288b13190928166c67592426d893a8fba98293fca98e1fb9f36054ce0
 EBUILD alexandria-0.6.5.ebuild 1631 RMD160 59cbbc57a59284737a059e0b5644cff6d3427a1d SHA1 cc17a5f6965297581d979dd76e43ee6f4122faaf SHA256 b29fb32b22e19377ec1b75b8a3e23f9b357b23e19bed30a31f72619f61b705ab
-EBUILD alexandria-0.6.6-r1.ebuild 1854 RMD160 76548eef5c91304a982a425243b696a800d10294 SHA1 f6504c16e7db35be8fa8587615de8928e753ff4b SHA256 308e5b0d1cfb035321c51a22e8f9b932efe4da35b59dba667dcad4f51f136e9e
-EBUILD alexandria-0.6.6.ebuild 1765 RMD160 0a4af8e429a7003f91512bf53601e38d1c1eca7a SHA1 1e52f04c650b14c7a362ca265ba627c55abd3cb6 SHA256 080a07443e0d08a9a02dbb4ce829d50b932f2cd65263a515a6b79d5fff521594
-MISC ChangeLog 5822 RMD160 67dae5e92e33e0ef961e373cf1808b766c304688 SHA1 a0c1fdba2b9e8c7dc6d768873b2071f31c7fc74e SHA256 d484a728de11618ac2e3a8c26e12229fb5136b5ca1a23b06d21e9126deca2cbb
+EBUILD alexandria-0.6.6-r1.ebuild 1734 RMD160 f927e4cc1ce2ad2ab7c0f22512fa765bab9b13b2 SHA1 9fd7b97d9f890fe021761bef11245b469703bf11 SHA256 10db9902b520c93f62f3fb1916469075bba1ef379053327c095cafc0ba318725
+EBUILD alexandria-0.6.6.ebuild 1657 RMD160 c4c07cc7ac48128b3dc939c7f96f5cf61b1f2016 SHA1 f19940fd7a9ed2e293374cf8383ded5b9a70744a SHA256 a5b1512f45b1a0d2bf9ec22e5cec0ea420b6393c7453c197d86ce62a72db683c
+MISC ChangeLog 6020 RMD160 a87353c84761ecfdcbabd3777131d6809a673e46 SHA1 aaae39deb7c3b42d759be62d272a9ae48204c2b0 SHA256 2419b5d6bbcdae4da11bb2fce1dffcc30781822575e3c0a68c48808b0ae2ff3e
 MISC metadata.xml 412 RMD160 22781e283441655607d305bdcdb742a649e35731 SHA1 21bdd783552eee61b48c952329cbbf5a08dd8409 SHA256 a7a97efa71df1e2ae81605713d72705a7aaff07756cfeb545defac70c9cce191
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwlH+cACgkQZihJkut28SsR3gD9FJlmHX4mu74PmXaDGVKLMpxw
-ZiMCzrH6xAqaF227ZBkBANPRhAZ90ktdCPCrL/1EHkB8Lq/golhq+acFbGa6Dzft
-=+kzS
+iEYEARECAAYFAkwoik4ACgkQNQqtfCuFneMAwwCfeVHCbDVv+/LOBHFHAVE2B3iM
+VOoAn3143ibD6PbhDj2p7XV48EDJdVR6
+=r+ox
 -----END PGP SIGNATURE-----
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}