[dev-db/virtuoso-*] EPREFIXify

6 files changed, 26 insertions, 14 deletions

diff --git a/dev-db/virtuoso-odbc/Manifest b/dev-db/virtuoso-odbc/Manifest
index 21560a9719..d1270719bf 100644
--- a/dev-db/virtuoso-odbc/Manifest
+++ b/dev-db/virtuoso-odbc/Manifest
@@ -2,6 +2,6 @@ AUX 5.0.12/5.0.12-common.patch 1977 RMD160 7362fc1dbfba9cb7be3cabf20963e8128ac92
 AUX 6.0.0/6.0.0-common.patch 1977 RMD160 7362fc1dbfba9cb7be3cabf20963e8128ac9285f SHA1 c5dfa6638cd925328f3db3b2eb30b13d10caac58 SHA256 61a63d31faed59366ec174790d093097bdb26f10e0f35344f088a9d59d86809a
 DIST virtuoso-opensource-5.0.12.tar.gz 65186909 RMD160 f8c4f7d229d8ce75a7abec74d15517e92c49694b SHA1 7e4a27b7a133ded8aa6c7c8834e72012582ff29a SHA256 db78f2256bb0d22ab253af78f9de05cf5c34e8a82b8d91dae454543af8ef9ec4
 DIST virtuoso-opensource-6.0.0.tar.gz 68235850 RMD160 16a0fb068f01a5d05e501a5f113a7675477e32c8 SHA1 511c3353201587b7921a107de48c2866b051be2f SHA256 e6c44aa8154f28ba7068b0846e94e9eaab599a986d0da62a367d20c79a3d3cac
-EBUILD virtuoso-odbc-5.0.12.ebuild 730 RMD160 b5352881ce044a42e910eca699284ffb2c5269fc SHA1 3831d7ace7fb07d17e4d405a6a5edb31d3982639 SHA256 b4e6f7666928643fd6630261df4d642a6d701bcdb09ff3ffb7a228f47030ac83
-EBUILD virtuoso-odbc-6.0.0.ebuild 730 RMD160 b5352881ce044a42e910eca699284ffb2c5269fc SHA1 3831d7ace7fb07d17e4d405a6a5edb31d3982639 SHA256 b4e6f7666928643fd6630261df4d642a6d701bcdb09ff3ffb7a228f47030ac83
+EBUILD virtuoso-odbc-5.0.12.ebuild 750 RMD160 a610160c1e91c073cced0429982c9cdbb3aa119f SHA1 019400557c8794b1c4521d92a39ba8382de4ab24 SHA256 c2e453cd05060804c963ecb0efb38e318e4ff0be4af858ebd8c30c08cd8391a7
+EBUILD virtuoso-odbc-6.0.0.ebuild 750 RMD160 a610160c1e91c073cced0429982c9cdbb3aa119f SHA1 019400557c8794b1c4521d92a39ba8382de4ab24 SHA256 c2e453cd05060804c963ecb0efb38e318e4ff0be4af858ebd8c30c08cd8391a7
 MISC metadata.xml 254 RMD160 5b019c6857b4f16e448b37bb41a23abf95aeaff0 SHA1 6dd78589487c63dfe4d45792c3064f9c7f9de417 SHA256 291d2bc4bebfae761cbb4df4e2cc50664e6de12ec7a11f8cb07e71098e70bd6c
diff --git a/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.12.ebuild b/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.12.ebuild
index 70d1cb0d02..a7e54aa220 100644
--- a/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.12.ebuild
+++ b/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.12.ebuild
@@ -34,13 +34,15 @@ src_configure() {
 }
 
 src_install() {
+	use prefix || ED="${D}"
+
 	virtuoso_src_install
 
 	# Remove libtool files
 	if ! use static-libs; then
 		local libdir
 		for libdir in $(get_all_libdirs); do
-			rm -f "${D}/${ROOT}usr/${libdir}"/*.la || die
+			rm -f "${ED}/usr/${libdir}"/*.la || die
 		done
 	fi
 }
diff --git a/dev-db/virtuoso-odbc/virtuoso-odbc-6.0.0.ebuild b/dev-db/virtuoso-odbc/virtuoso-odbc-6.0.0.ebuild
index 70d1cb0d02..a7e54aa220 100644
--- a/dev-db/virtuoso-odbc/virtuoso-odbc-6.0.0.ebuild
+++ b/dev-db/virtuoso-odbc/virtuoso-odbc-6.0.0.ebuild
@@ -34,13 +34,15 @@ src_configure() {
 }
 
 src_install() {
+	use prefix || ED="${D}"
+
 	virtuoso_src_install
 
 	# Remove libtool files
 	if ! use static-libs; then
 		local libdir
 		for libdir in $(get_all_libdirs); do
-			rm -f "${D}/${ROOT}usr/${libdir}"/*.la || die
+			rm -f "${ED}/usr/${libdir}"/*.la || die
 		done
 	fi
 }
diff --git a/dev-db/virtuoso-server/Manifest b/dev-db/virtuoso-server/Manifest
index 6bd6cabc01..4823ee5e80 100644
--- a/dev-db/virtuoso-server/Manifest
+++ b/dev-db/virtuoso-server/Manifest
@@ -2,6 +2,6 @@ AUX 5.0.12/5.0.12-common.patch 1977 RMD160 7362fc1dbfba9cb7be3cabf20963e8128ac92
 AUX 6.0.0/6.0.0-common.patch 1977 RMD160 7362fc1dbfba9cb7be3cabf20963e8128ac9285f SHA1 c5dfa6638cd925328f3db3b2eb30b13d10caac58 SHA256 61a63d31faed59366ec174790d093097bdb26f10e0f35344f088a9d59d86809a
 DIST virtuoso-opensource-5.0.12.tar.gz 65186909 RMD160 f8c4f7d229d8ce75a7abec74d15517e92c49694b SHA1 7e4a27b7a133ded8aa6c7c8834e72012582ff29a SHA256 db78f2256bb0d22ab253af78f9de05cf5c34e8a82b8d91dae454543af8ef9ec4
 DIST virtuoso-opensource-6.0.0.tar.gz 68235850 RMD160 16a0fb068f01a5d05e501a5f113a7675477e32c8 SHA1 511c3353201587b7921a107de48c2866b051be2f SHA256 e6c44aa8154f28ba7068b0846e94e9eaab599a986d0da62a367d20c79a3d3cac
-EBUILD virtuoso-server-5.0.12.ebuild 2183 RMD160 eb4181a03d75b660fd1fd06d3421d70a87902574 SHA1 ee6a1976e0c4f82965a9dff30b55ef199ede9415 SHA256 99792445d2951d085aec4039c73dae57fb6c317b5936f1eb527e46acfbd46584
-EBUILD virtuoso-server-6.0.0.ebuild 2183 RMD160 eb4181a03d75b660fd1fd06d3421d70a87902574 SHA1 ee6a1976e0c4f82965a9dff30b55ef199ede9415 SHA256 99792445d2951d085aec4039c73dae57fb6c317b5936f1eb527e46acfbd46584
+EBUILD virtuoso-server-5.0.12.ebuild 2210 RMD160 625ef285d5f160eae9a4daf9f085c38287631d01 SHA1 8c7d33e9e07a0e0fd8d9b00d331486e7031f7db1 SHA256 5ba2d51d52c43d88b0f0a9c378d17d61ab1388f1ef7ceeb0b3b00941b8111b04
+EBUILD virtuoso-server-6.0.0.ebuild 2210 RMD160 625ef285d5f160eae9a4daf9f085c38287631d01 SHA1 8c7d33e9e07a0e0fd8d9b00d331486e7031f7db1 SHA256 5ba2d51d52c43d88b0f0a9c378d17d61ab1388f1ef7ceeb0b3b00941b8111b04
 MISC metadata.xml 775 RMD160 a7f1f3ce2ef51c602d2d2958957616fcc919f387 SHA1 e13c67e3edc57c76038546e71e18f53243e8d71d SHA256 533745d604ee750e2d00d65448014b1c060f605a60707f5452528ca6512096fd
diff --git a/dev-db/virtuoso-server/virtuoso-server-5.0.12.ebuild b/dev-db/virtuoso-server/virtuoso-server-5.0.12.ebuild
index 617330a251..ec2cf6cf3c 100644
--- a/dev-db/virtuoso-server/virtuoso-server-5.0.12.ebuild
+++ b/dev-db/virtuoso-server/virtuoso-server-5.0.12.ebuild
@@ -68,22 +68,26 @@ src_configure() {
 }
 
 src_install() {
+	use prefix || ED="${D}"
+
 	virtuoso_src_install
 
 	# Rename isql executables (conflicts with unixODBC)
-	mv "${D}/${ROOT}usr/bin/isql" "${D}/${ROOT}usr/bin/isql-v" || die
-	mv "${D}/${ROOT}usr/bin/isqlw" "${D}/${ROOT}usr/bin/isqlw-v" || die
+	mv "${ED}/usr/bin/isql" "${ED}/usr/bin/isql-v" || die
+	mv "${ED}/usr/bin/isqlw" "${ED}/usr/bin/isqlw-v" || die
 
 	dodoc AUTHORS ChangeLog CREDITS INSTALL NEWS README || die "dodoc failed"
 
-	keepdir "${ROOT}var/lib/virtuoso/db"
+	keepdir /var/lib/virtuoso/db
 }
 
 pkg_postinst() {
+	use prefix || EROOT="${ROOT}"
+
 	echo
 	einfo "To start the database server:"
 	echo
-	einfo "# cd ${ROOT}var/lib/virtuoso/db"
+	einfo "# cd ${EROOT}var/lib/virtuoso/db"
 	einfo "# virtuoso-t -f &"
 	echo
 	einfo "Then you should be able to access http://localhost:8890/"
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.0.0.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.0.0.ebuild
index 617330a251..ec2cf6cf3c 100644
--- a/dev-db/virtuoso-server/virtuoso-server-6.0.0.ebuild
+++ b/dev-db/virtuoso-server/virtuoso-server-6.0.0.ebuild
@@ -68,22 +68,26 @@ src_configure() {
 }
 
 src_install() {
+	use prefix || ED="${D}"
+
 	virtuoso_src_install
 
 	# Rename isql executables (conflicts with unixODBC)
-	mv "${D}/${ROOT}usr/bin/isql" "${D}/${ROOT}usr/bin/isql-v" || die
-	mv "${D}/${ROOT}usr/bin/isqlw" "${D}/${ROOT}usr/bin/isqlw-v" || die
+	mv "${ED}/usr/bin/isql" "${ED}/usr/bin/isql-v" || die
+	mv "${ED}/usr/bin/isqlw" "${ED}/usr/bin/isqlw-v" || die
 
 	dodoc AUTHORS ChangeLog CREDITS INSTALL NEWS README || die "dodoc failed"
 
-	keepdir "${ROOT}var/lib/virtuoso/db"
+	keepdir /var/lib/virtuoso/db
 }
 
 pkg_postinst() {
+	use prefix || EROOT="${ROOT}"
+
 	echo
 	einfo "To start the database server:"
 	echo
-	einfo "# cd ${ROOT}var/lib/virtuoso/db"
+	einfo "# cd ${EROOT}var/lib/virtuoso/db"
 	einfo "# virtuoso-t -f &"
 	echo
 	einfo "Then you should be able to access http://localhost:8890/"