Moved source scripts/modules to ps3-env package.

4 files changed, 5 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c0c4028dd66..44ad1e2a80c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = ps3toolchain
 	pkgdesc = Meta package for tools used in the creation of homebrew software for the Sony PlayStation 3 videogame system.
-	pkgver = 20230405
+	pkgver = 20230409
 	pkgrel = 1
 	url = https://github.com/ps3dev/ps3toolchain
-	install = ps3toolchain.install
 	arch = any
 	license = MIT
+	depends = ps3-env>=20230409
 	depends = ps3-ppu-binutils>=2.40
 	depends = ps3-ppu-gcc>=9.5.0
 	depends = ps3-spu-binutils>=2.22
@@ -13,7 +13,5 @@ pkgbase = ps3toolchain
 	depends = ps3-psl1ght=20230214
 	depends = ps3-zlib>=1.2.13
 	optdepends = env-modules
-	source = modulefile
-	sha256sums = 171871f1bbdc77d9768e795fad0b06d38dd10e1dc6c67fee71560886c0bbb876
 
 pkgname = ps3toolchain
diff --git a/PKGBUILD b/PKGBUILD
index 9b7be211a725..b5bebaebadba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,15 @@
 # Maintainer: Darjan Krijan [https://disc-kuraudo.eu]
 
 pkgname=ps3toolchain
-pkgver=20230405
+pkgver=20230409
 pkgrel=1
 pkgdesc='Meta package for tools used in the creation of homebrew software for the Sony PlayStation 3 videogame system.'
 url='https://github.com/ps3dev/ps3toolchain'
 arch=('any')
 license=('MIT')
 depends=(
+	# Environment
+	'ps3-env>=20230409'
 	# Toolchain
 	'ps3-ppu-binutils>=2.40'
 	'ps3-ppu-gcc>=9.5.0'
@@ -19,27 +21,3 @@ depends=(
 	'ps3-zlib>=1.2.13'
 )
 optdepends=(env-modules)
-install=${pkgname}.install
-source=(
-	"modulefile"
-)
-sha256sums=(
-	'171871f1bbdc77d9768e795fad0b06d38dd10e1dc6c67fee71560886c0bbb876'
-)
-
-_prefix="/opt/ps3dev"
-
-package() {
-	mkdir -p "${pkgdir}${_prefix}"
-
-	echo "export PS3DEV=\"${_prefix}\""   > "${pkgdir}${_prefix}/${pkgname}.sh"
-	echo "export PSL1GHT=\"\${PS3DEV}\"" >> "${pkgdir}${_prefix}/${pkgname}.sh"
-	echo "export PATH=\"\${PS3DEV}/bin:\${PATH}\""     >> "${pkgdir}${_prefix}/${pkgname}.sh"
-	echo "export PATH=\"\${PS3DEV}/ppu/bin:\${PATH}\"" >> "${pkgdir}${_prefix}/${pkgname}.sh"
-	echo "export PATH=\"\${PS3DEV}/spu/bin:\${PATH}\"" >> "${pkgdir}${_prefix}/${pkgname}.sh"
-
-	# env-modules (optional)
-	cp "${srcdir}/modulefile" "${pkgdir}${_prefix}"
-	mkdir -p "${pkgdir}/etc/modules/modulefiles/"
-	ln -s "${_prefix}/modulefile" "${pkgdir}/etc/modules/modulefiles/${pkgname}"
-}
diff --git a/modulefile b/modulefile
deleted file mode 100644
index 166e4ef1b9f9..000000000000
--- a/modulefile
+++ /dev/null
@@ -1,25 +0,0 @@
-#%Module1.0
-#
-# Created by Darjan Krijan [https://disc-kuraudo.eu]
-#
-
-set MODULE          "ps3toolchain"
-set BASE_DIR        "/opt/ps3dev"
-set VERSION         "20230307"
-set PS3TC_ROOT      "${BASE_DIR}"
-set PS3TC_TEXT      "Tools used in the creation of homebrew software for the Sony PlayStation 3 videogame system."
-
-setenv        PS3DEV           ${PS3TC_ROOT}
-setenv        PSL1GHT          ${PS3TC_ROOT}
-prepend-path  PATH             ${PS3TC_ROOT}/bin
-prepend-path  PATH             ${PS3TC_ROOT}/ppu/bin
-prepend-path  PATH             ${PS3TC_ROOT}/spu/bin
-
-module-whatis  "${PS3TC_TEXT} version ${VERSION}"
-
-proc ModulesHelp {} {
-	global PS3TC_TEXT
-	puts stderr "This module sets up the environment for ${PS3TC_TEXT}"
-	puts stderr "by adapting the following environment variables:"
-	puts stderr "PS3DEV, PSL1GHT, PATH"
-}
diff --git a/ps3toolchain.install b/ps3toolchain.install
deleted file mode 100644
index 89444601ed28..000000000000
--- a/ps3toolchain.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-	if pacman -Q env-modules &> /dev/null; then
-		echo "env-modules seems to be installed:"
-		echo "If configured correctly, you can conveniently use"
-		echo "  $ module load ps3toolchain"
-		echo "to set up the environment for ps3toolchain."
-		echo "Alternatively source /opt/ps3dev/ps3dev.sh."
-	else
-		echo "Source /opt/ps3dev/ps3dev.sh to use ps3toolchain."
-	fi
-
-}
-
-post_upgrade() {
-	post_install
-}