Some enhancements to the ebuild

svn path=/sunrise/; revision=3260

diff --git a/net-ftp/foff/Manifest b/net-ftp/foff/Manifest
index a7e9c656fe265a7f48d9a6dd3b9d5b9824636240..473fc3c9967fddc9e81101741c0401e6dee10a9d 100644 (file)
--- a/net-ftp/foff/Manifest
+++ b/net-ftp/foff/Manifest
@@ -1,4 +1,4 @@
 DIST foff-0.99.5.tar.gz 105314 RMD160 dde8197958e18c88eca7676e7d5993c26a2bb262 SHA1 1001fee92ad562689820181166ae3cdb3d2833db SHA256 d4cca0614363e6dc3d0700439542dc667342fdfa4be230aee4d016b9e98e9009
-EBUILD foff-0.99.5.ebuild 933 RMD160 d1d8ee0b25cccc0e4e8c9228f4838f7eb924960c SHA1 99db32b685beb52affd35ff19f7431da2b5edb89 SHA256 34ecb74828f2ae43d69d1375a3316e8b7380a731052d0f7df8392461b9855843
+EBUILD foff-0.99.5.ebuild 1092 RMD160 151393bb829cf04dc0e751a0c88bfe54b76cda6d SHA1 aab6042306a790087d4c1aef29422bb1bbe16fba SHA256 98d895253abdcfa2265acab95bdc9a0ec5909c54322f00959e24497434c4390b
 MISC ChangeLog 788 RMD160 3341a356626338afcbf05d3c81761aa5073f0349 SHA1 464e23fafb936f366298015f42bf02ea81805f0d SHA256 412315138579b942fe72fac27f9d29a5811a2f66f8c3a401e2c1bb701365eede
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/net-ftp/foff/foff-0.99.5.ebuild b/net-ftp/foff/foff-0.99.5.ebuild
index 26b6c2fc1168c028cccd87610d04876004a0a9ab..37b38adc999b6d4796b51f00a036746fd2f68e7e 100644 (file)
--- a/net-ftp/foff/foff-0.99.5.ebuild
+++ b/net-ftp/foff/foff-0.99.5.ebuild
@@ -14,27 +14,28 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 S=${WORKDIR}/${PN}
 
-DEPEND=">=dev-lang/python-2.3
+RDEPEND=">=dev-lang/python-2.3
        >=dev-python/pygtk-2.6"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 src_install() {
+       python_version
        # Copying.txt is needed by the about window
-       insinto "/usr/$(get_libdir)/${PN}"
+       insinto "${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}"
        doins *.py foff_logo00.png *.glade *.gladep Copying.txt
 
-       # The app needs to be executed from the installed dir
-       echo -e "#!/bin/bash \ncd "/usr/$(get_libdir)/${PN}" \n\
-/usr/bin/python ${PN}.py" >> foff
+       make_wrapper foff "/usr/bin/python ${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/${PN}.py" \
+                ${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
 
-       dobin foff
        dodoc Readme.txt ChangeLog.txt
 }
 
 pkg_postinst() {
-       python_mod_optimize "${ROOT}usr/$(get_libdir)/${PN}"
+       python_version
+       python_mod_optimize "${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}"
 }
 
 pkg_postrm() {
-       python_mod_cleanup "${ROOT}usr/$(get_libdir)/${PN}"
+       python_version
+       python_mod_cleanup "${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}"
 }