introduce a pkg_setup(), egg install to libpath

2 files changed, 27 insertions, 23 deletions

diff --git a/games-util/dfhack/Manifest b/games-util/dfhack/Manifest
index 143649c..afce8d3 100644
--- a/games-util/dfhack/Manifest
+++ b/games-util/dfhack/Manifest
@@ -1,13 +1,12 @@
 AUX clsocket/0001-Compile-static-library-as-PIC.patch 960 SHA256 cb06cba3d104096302ec094e340bb5d99e82b68bce30bd094d0fef54bf33f4c3 SHA512 d09d18647c8db7c9a98f28ac73f5a1a2e7921b631e8f2f59fe6a704b949698eb860d786fd8e17cb495946e261966d6fdadd501bdf1b05abf55f0a89b228e0104 WHIRLPOOL 7f891ef012c6cb16d596cb32dba78543a7327a706bada24f0de660777815f242d977468b22847df5e92d976a5a91147fcf758fdb687e464b8f18d2a38aa321bd
-AUX stonesense/0001-Compile-static-dependency-libraries-as-PIC.patch 2560 SHA256 68b963d4ee79406c960064d8bbf0872fdc44ca91c487941d7ee6afa4790965f4 SHA512 ccd3463d0e764f87957d19db9f0b5f194adc93498ed62d20ac3b75be6a73a9928b2b37a004511b37e5dc5bc91f6bf244ba14636d43b6372069485c38599ec009 WHIRLPOOL dfc24a318470454b79b89793bfcacb7135839284bdcd895a80400c21598ca093a643f00fe78edb524e865a351c27c339d49e40c5b5b961a1216ec5928dab5c20
+AUX dfhack-0.34.11-r2/0001-Compile-static-dependency-libraries-as-PIC.patch 2560 SHA256 af6e1ff8d7ddf05c201eef9df795ee8c4c7ae1a7e4d07a2a3b2dd6d05bb270ab SHA512 ddd9fd5849725abd169bad3c85d6fcb98d92a210dfe8ac737c07655c50b59e8c6b457fe86aa0c467a5dcaa4ba20528c71971278eea7c5b7a5d5e20810fe18852 WHIRLPOOL b1f4d6763a88a8f34e1654b2b93c5948c9c90544b97f8cdc6aa2747e6db1a0a34610693796e01d36f9dfaf8798717d4768600077e667ca196e78cf2fb54a18c6
+AUX dfhack-0.34.11-r2/0002-removed-magic-flags-and-paths-from-build-system.patch 7972 SHA256 159d19c627482f293cca4f281c42b2fe4f25d0fe708f1efff533cd28f4742d3a SHA512 4f68ec733f09093a079810b026b63e5b9694583188e335ce57949f64a5ca4689fe02819370088fb5c9de82e3386dd2fadd4556e87eaa205cd36d9c6d9fe08cc9 WHIRLPOOL 547563a0682529410e557d4372d580478db3bc642242170d2462331b8b786747f2a2f5021a832011185bfbf34d3d2fa1b9c023386034b4f8d70f7908a645fd98
+AUX dfhack-0.34.11-r2/0003-tell-various-components-about-non-magic-paths.patch 5346 SHA256 9b50aee749944915594f4a5034a33198d00a0a3ac0e17e5c099edf01537154a5 SHA512 0587fcda003a1c6212751761f04b059399d4ff045b3c4d15c7fb9203dcf59e87d96fef996762078ee4de1e00c9d135bb914887e3fec81cfb7e0f3add8e2362d9 WHIRLPOOL 1462a7b93cdb16a87eca89fbbfe02f9e3cd48287b89cd46449a4cee02c09b33366e8eb4f294c7b439382ff5ad9539f6c8ecb030da9cbe82aa1ba59c785f8bcf0
+AUX dfhack-0.34.11-r2/0004-compile-time-configurable-statedir.patch 3337 SHA256 8d4a1a67e6a2c1e6a311ea17e099e8c60c93b911d6ab46399ab31b30eb01cf0f SHA512 1a03b601f16846a0394476df09de5d3c456837dc8cfe6e021204b2fc145bb8a52c9aa0647799c5cb886209ce87b1120f2eeea3477189e7ba8666f71e5cc53ee5 WHIRLPOOL 77b17bc66f365f5b9829df44327ffc269f350b01709f72ba3c5345da534deea0915f58a7a3257844048b13eba5bf4f56941455a359f6966d19e9121182f335d8
 AUX stonesense/0001-dont-segfault-if-logfile-is-unwritable.patch 1064 SHA256 6e9fc52b4a7779c50332e98d3d0a5949197dea352639e6c0aa9f2c170d1558d7 SHA512 0a6e5113d7fcb8fe241e6cb2eb58b8428b871675fdcc3f7234c5fc953820eac3c7efa088eca5bfc1062c439577800a8b6c38b7d22e8ba34cfb00806bb285b783 WHIRLPOOL 73ab1749346ab2f889fb16c9ec91b96dcbecc1607ac8e42c586fa407a3186e042fa74c7086dd7f2b1fc0812c524e7c309fb0f16a2a35f7c782eb182bd2fe7ea3
 AUX stonesense/0002-compile-time-configuration-of-magic-cwd.patch 7753 SHA256 79e024cbcf34998866dee56b7e27b1cad3a8d3da152bbc43b329723109d58d51 SHA512 b892aa4a94eefefe63d52352f2f01a76327fdcdf99cce5c565738f82b7b45de8536128dc7529df52bb4a465d5e198e0c774d0690f5577e8533b8f08221b6e377 WHIRLPOOL ce9507bb7f67666f87a8463cab941ad2ba1b14e8ec3000d587855a2922ca5a186dffd062c752bb313ac111d9645c979421b0657082c44c3ac000c3e8c787b25e
-AUX stonesense/0002-removed-magic-flags-and-paths-from-build-system.patch 7972 SHA256 3930c1cf8f8e9bb08fa87991160795adca28462a0cf2077be02e732378679195 SHA512 52dd3df6c924ef09b8de81064b91f1779c8fbce06c010beeb634c1e9e482b22658ad2ca605206f62ad479d564ae7ea7d7be68b8229f23a9352cc5758b2653a89 WHIRLPOOL 9277afd6297a3784eb494dd5e9d9841d7e5770c7fc78a2fb6bc0bfd67568759df2f7b8025b0fcc1abb8f430a74d0ba0855f53b1ae1d24831e825c4bdd2150613
 AUX stonesense/0003-screenshots-in-home-dir.patch 2578 SHA256 88bc1a28442dfe8e5ff08e27e82de6443a3c5bccf49d7bcb2a26637a71ae3e18 SHA512 988efaba82e96149641e8dd6d8769b3ac1d890ebaa35128507a8f0d633af947ad9d8090758e1734a2f9b118c5404e4d712e2abb9a4e971f980f4163c0b646f5b WHIRLPOOL f3f03c297fbd39f27b5957cca0073a3420a10ba0a1741cf73f210cf680c2083c761cb68a637663281e69d1fee9e7b5049c3074f18fed394f48888bc377f5bb70
-AUX stonesense/0003-tell-various-components-about-non-magic-paths.patch 5346 SHA256 58fe6f1897a8ee508e7f733753449a0d7553803aceac7948b0630160968e2a54 SHA512 6def4e1bd38eedd74fe445b1e147e959ed20704895ff67c9d2c76fd7030761f36ad3b5ef69d640be78ba2bc174265567df1053dae6fbaba280287064dcd7ff96 WHIRLPOOL e2b1d9249783c802e07324f55261851923f645e4a5890e711d5e18c82d9c953496ac1ed6e9560211e2a8432f0dc9814b48f90b177712353c57c51fd3d4efa5ba
-AUX stonesense/0004-compile-time-configurable-statedir.patch 3337 SHA256 68c69af2216efa341618307041c4875c42533a10711b524417dcb2dee00c4d22 SHA512 2adfc4640956ac2ded52da9b1b20e13c9faf5b56f0726e21bffbf6da067336c17a15251bfd39c29c0c08a424d8e4bd94db2e79985399e022fd3a2c5ac0ee63e5 WHIRLPOOL 6e95715aa471271a14dd0d6d05d9f7baebe332add0960b6ff555ee0559d7ddb562a88a89ddf28b0c82dae4249d1aa4e62080f5c10795f380adff3ec3a30c0d49
 AUX stonesense/0004-create-various-output-files-in-HOME-not-cwd.patch 5217 SHA256 3ac09c948cc36b04058a82cb9f04e0ff26ffee765bf2300a46eac09cebc867de SHA512 9f0c2c5f4a2d15c99e06d30e1d3825527449f63de4d370533f07ce4324d0afbd1a2190dcf9589cbd326fd0f9705333bb436bed74e72ac4a7485f002fa3600639 WHIRLPOOL cbe81a086301a3dc218f31e3b1edb837bd81a25d151e5d46c0988d080165e95faac8ab14a97995a7092262542cbb8b29a2a540fe45a5c74b520e47ec5ab0f420
-AUX stonesense/0005-remove-annoying-banner.patch 1394 SHA256 7db8259c2e6d473db0f1af3ad98f0b55272f2fdab3c56e9a1198a6cb0848c58f SHA512 d4b5e801deb04f11080cda61b4da80192172e75548978272976c23d9168d443bd274ccb53c39f701df45f73032ee126d04aa2fb8a86816c2003d8635afdf7857 WHIRLPOOL 9dc6fb52b3f65f5696470d2a8482e693702f72382cf1d71d22f053a536d20b438a1b2a584249738f134bd4f9a08d67c7f19f4db2a909a3c929316a2f45e650b8
-EBUILD dfhack-0.34.11.2.ebuild 5230 SHA256 0982a4adcdca324c69edc775fab40695e236543ea6a40fe2d37cd2200fb3a485 SHA512 b5981b39c94b858e42f292529a6af8edf41d11609f06bbae137da1ffa991e985061a1bcff694fb1d48cfa43462a2fe4718970b7a8fa9080b750a67f4228cb101 WHIRLPOOL e0ab5108d3a1e79f33155c666f1a64b2b76c4d1f110391af3050a2b38996c76d70626eb8dd2d45be1f0d842674371c62663d2a5bc8772397d33a479389cde569
+EBUILD dfhack-0.34.11.2.ebuild 5343 SHA256 01a905109dbea7331915d9fcfe5608171120e1dcee3b6677fe31109181cd4e07 SHA512 429603e95cabd9525c149c759f30ab5a8db711f4033f219d026f638ac86c78e9376197bfb0d46bbe45bdccb10f3705182750d334755df25c055db2367350707c WHIRLPOOL e1ee844fed9a3c5f77544f51e3ba6d4dc94b17577567942da9c4478fc47be6256add51cc8904d1df5bc43776e76cc24239e2ca2f83d617b1ba09a73762621622
 EBUILD dfhack-9999.ebuild 5247 SHA256 3c1d011b03a81b42a27e905d8edd111670863adf424b267d49052c1b256024e5 SHA512 50702fddc31cda43c2ffaf72bd204b1a42959fcb60aba79538470f4d8daec9f41263f004b722178e537b66a919d7f8a900c552a3ceca971db7e1a3cbdd781c14 WHIRLPOOL e00c37113c909e8d2cec041f80b994ab8236de3748ae2ec8112d4c90f7e653373b72a29b5e947c73c96263a8f0cc265bbcd53df273dd046fb8b0316cbbdf303d
 MISC metadata.xml 572 SHA256 913cbd415cc83010473062c137ac57dba4541349efec58e0a8325be33cb0a77c SHA512 167c1513cca31c08a89503b4b960cc1b45c43c1d9552e8c6cf01d8c837fb99669b898ba58c7e192b5fdef6959db9f123179d9a86e2125dccc1ed76e28ffe3904 WHIRLPOOL 9866820cb844e7c36abf92ac117bbe4cc0b804444441c24a366a61304b21baeded55e122393b393fbb7a47b08abb787cc8aecd6b4c89546c7201153652a3c957
diff --git a/games-util/dfhack/dfhack-0.34.11.2.ebuild b/games-util/dfhack/dfhack-0.34.11.2.ebuild
index 8fc4287..0a3c359 100644
--- a/games-util/dfhack/dfhack-0.34.11.2.ebuild
+++ b/games-util/dfhack/dfhack-0.34.11.2.ebuild
@@ -49,12 +49,18 @@ RDEPEND="${COMMON_DEPEND}
 QA_PREBUILT+="${GAMES_DATADIR#/}/${P}/lib32/libruby.so"
 # The allegro libs are also prebuilt, but don't break things.
 
-src_prepare() {
+pkg_setup() {
 	multilib_toolchain_setup x86
+	export dfhack_datadir="${GAMES_DATADIR}/${P}"
+	export dfhack_docdir="/usr/share/doc/${P}"
+	if use egg; then
+		export dfhack_libdir="$(games_get_libdir)"
+	else
+		export dfhack_libdir="$(games_get_libdir)/${P}"
+	fi
+}
 
-	local datadir="${GAMES_DATADIR}/${P}"
-	local dfhack_libdir="${datadir}/lib32"
-
+src_prepare() {
 	local EPATCH_FORCE="yes"
 	local EPATCH_SUFFIX="patch"
 	if [[ ! "${PV}" == "9999" ]]; then
@@ -64,25 +70,25 @@ src_prepare() {
 	EPATCH_SOURCE="${FILESDIR}/clsocket" epatch
 	if use ssense; then
 		cd "${S}/plugins/stonesense" || die
-		EPATCH_SOURCE="${FILESDIR}/ssense" epatch
+		EPATCH_SOURCE="${FILESDIR}/stonesense" epatch
 	fi
 	cd "${S}" || die
 
 	# Fix up the startup scripts
 	sed -f - -i "package/linux/dfhack" "package/linux/dfhack-run" <<- EOF || die
-		s%"\./stonesense/deplibs"%"${datadir}/stonesense/deplibs"%
+		s%"\./stonesense/deplibs"%"${dfhack_datadir}/stonesense/deplibs"%
 		s%"\./hack"%"${dfhack_libdir}"%
 		s%\./hack/libdfhack.so%"${dfhack_libdir}/libdfhack.so"%
 		s%\./libs/Dwarf_Fortress%"df-34.11"%
 		s%hack/dfhack-run%"${dfhack_libdir}/dfhack-run"%
 		EOF
 
-	sed -i "s:\./hack/ruby/:${GAMES_DATADIR}/${P}/ruby/:" \
+	sed -i "s:\./hack/ruby/:${dfhack_datadir}/ruby/:" \
 		"./plugins/ruby/ruby.rb" || die
 	if use dfusion; then
 	sed -f - -i plugins/Dfusion/luafiles/{init.lua,friendship/{init.lua,plugin.lua,install.lua},triggers/{plugin.lua,functions_menu.lua},friendship_civ/init.lua,common.lua,embark/{init.lua,plugin.lua},migrants/{init.lua,plugin.lua},xml_struct.lua,xml_types.lua} <<- EOF || die
-		s:("dfusion/:("${datadir}/dfusion/:
-		s:('dfusion/:('${datadir}/dfusion/:
+		s:("dfusion/:("${dfhack_datadir}/dfusion/:
+		s:('dfusion/:('${dfhack_datadir}/dfusion/:
 		EOF
 		sed -i "s:libs/Dwarf_Fortress:Dwarf_Fortress:" \
 			"plugins/Dfusion/luafiles/common.lua" || die
@@ -96,16 +102,15 @@ src_prepare() {
 }
 
 src_configure() {
-	local MY_DOCDIR="/usr/share/doc/${P}"
 	mycmakeargs=(
 		"-DCMAKE_INSTALL_PREFIX=${GAMES_DATADIR}"
 		"-DDFHACK_BINARY_DESTINATION=${GAMES_BINDIR}"
 		# We install interesting libs, let's not infect the rest of the system.
-		"-DDFHACK_LIBRARY_DESTINATION=${GAMES_DATADIR}/${P}/lib32"
+		"-DDFHACK_LIBRARY_DESTINATION=${dfhack_libdir}"
 		"-DDFHACK_EGGY_DESTINATION=$(games_get_libdir)"
-		"-DDFHACK_DATA_DESTINATION=${GAMES_DATADIR}/${P}"
-		"-DDFHACK_USERDOC_DESTINATION=${MY_DOCDIR}"
-		"-DDFHACK_DEVDOC_DESTINATION=${MY_DOCDIR}/dev"
+		"-DDFHACK_DATA_DESTINATION=${dfhack_datadir}"
+		"-DDFHACK_USERDOC_DESTINATION=${dfhack_docdir}"
+		"-DDFHACK_DEVDOC_DESTINATION=${dfhack_docdir}/dev"
 		"-DDFHACK_STATEDIR=${GAMES_STATEDIR}/${P}"
 		"-DBUILD_LIBRARY=ON"
 		# Breaks slotting
@@ -145,10 +150,10 @@ src_install() {
 	dodir "${GAMES_STATEDIR}/${P}"
 	if use ssense; then
 		dodir "${GAMES_SYSCONFDIR}/${P}/stonesense"
-		mv "${D}/${GAMES_DATADIR#/}/${P}/stonesense/init.txt" \
+		mv "${D}/${dfhack_datadir#/}/stonesense/init.txt" \
 			"${D}/${GAMES_SYSCONFDIR#/}/${P}/stonesense/init.txt" || die
 		dosym "${GAMES_SYSCONFDIR}/${P}/stonesense/init.txt" \
-			"${GAMES_DATADIR}/${P}/stonesense/init.txt"
+			"${dfhack_datadir}/stonesense/init.txt"
 		elog
 		elog "The Stonesense configuration file can be found at"
 		elog "${GAMES_SYSCONFDIR}/${P}/stonesense/init.txt"
@@ -166,7 +171,7 @@ pkg_postinst() {
 	elog "results."
 	elog
 	elog "DFHack installs custom raw files for Dwarf Fortress in"
-	elog "${GAMES_DATADIR}/${P}/raw"
+	elog "${dfhack_datadir}/raw"
 	elog "To use them, copy them into your raw folder and apply the diffs."
 	elog
 	elog "To start DFHack, please run dfhack-${PV}"