app-misc/fslint: Belated version bump. Update ebuild so it works with current python...

svn path=/sunrise/; revision=12066

diff --git a/app-misc/fslint/ChangeLog b/app-misc/fslint/ChangeLog
index 030a3a01c378bac800de914d46d2ef510fe33265..6d2f9f297f66de8d4df2b44913405025418af901 100644 (file)
--- a/app-misc/fslint/ChangeLog
+++ b/app-misc/fslint/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for app-misc/fslint
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 May 2011; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  -fslint-2.24.ebuild, +fslint-2.42.ebuild:
+  Belated version bump. Update ebuild so it works with current python.eclass.
+  Add EAPI 3 support. Set liblocation variable using sed instead of a dummy
+  python module. Add some comments and die-s, and fix messy emake invocation.
+
   16 Jan 2008; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
   -fslint-2.18.ebuild, +fslint-2.24.ebuild:
   Version bump. Update HOMEPAGE. Keyword ~amd64.

diff --git a/app-misc/fslint/Manifest b/app-misc/fslint/Manifest
index 6d3eac659e7365903c80ab097353525c9ed05040..f6464ecd1e7c6e259acb216436270b0346da20ec 100644 (file)
--- a/app-misc/fslint/Manifest
+++ b/app-misc/fslint/Manifest
@@ -1,4 +1,4 @@
-DIST fslint-2.24.tar.gz 87255 RMD160 07af6f0c9e9d640295e1c3650040cc15706df190 SHA1 086be5c3509b187ca3f6d01d12a1f0f275995911 SHA256 c738e6045e4617d8f9c9a151a644fb4ac0a2ff6ffbfc0e05878f9d7b2a3d4ef6
-EBUILD fslint-2.24.ebuild 1255 RMD160 7500fcc935f6195a3c058731344170a57695137e SHA1 cde7100ee4750f4f6ab6b937ba66d38518fd2f44 SHA256 9435a1b861c6da1e90dc1643de7b614227b16a78fb73839a97ecd6d96c0861c1
-MISC ChangeLog 566 RMD160 95c6a7c9f06f06bacf3daa6a21ea8303d3b563a5 SHA1 eacb852267a507be2d5fe06f5c54e267c7be4c62 SHA256 6e82a357351810b30a91e20939d6f8e0c4d261d746693be676f66b2cbf3ef05f
+DIST fslint-2.42.tar.gz 111520 RMD160 23e825cd7d798b750c4fe435b731c6e77f15badb SHA1 607a1a8cc391537151660e1129a4c95908509b80 SHA256 babbef4a34f42ab1d396152fd79b4353adc114b2e8d68b838e20a8067c5a3273
+EBUILD fslint-2.42.ebuild 1421 RMD160 44d6765b8bf600a928f6a13f6154f3202b912955 SHA1 0483a84a11be748f6ddae91f4210b7341b3e51d5 SHA256 600e49971201bb33df09e29629a70553591ebaf493e7cb996fc8213eab37e4ef
+MISC ChangeLog 913 RMD160 864ab24461a65583acc16b26dc8eff89320af6ec SHA1 1db2a1fe8eb10821a8d3dc18d9a7db7a4cf09688 SHA256 4dc1409b7160b80fa0639fc08065d103be5fc8b2b67e5dd79d92fa6721049302
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/app-misc/fslint/fslint-2.24.ebuild b/app-misc/fslint/fslint-2.24.ebuild
deleted file mode 100644 (file)
index 857e793..0000000
--- a/app-misc/fslint/fslint-2.24.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils python multilib
-
-DESCRIPTION="A utility to find various forms of lint on a filesystem"
-HOMEPAGE="http://www.pixelbeat.org/fslint/"
-SRC_URI="http://www.pixelbeat.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=">=dev-python/pygtk-2.0"
-
-src_install() {
-       dodir /usr/share/${PN}
-       cp -R ${PN}/ "${D}"/usr/share/${PN}
-
-       insinto /usr/share/${PN}
-       doins ${PN}{.glade,.gladep,_icon.png} || die "doins failed"
-
-       exeinto /usr/bin
-       doexe ${PN}-gui || die "doexe failed"
-
-       python_version
-       local pydir="/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}"
-       dodir ${pydir}
-       echo "liblocation = '/usr/share/${PN}/'" > "${D}"/${pydir}/__init__.py
-
-       doicon ${PN}_icon.png
-       domenu ${PN}.desktop
-
-       dodoc doc/*
-       doman man/*
-
-       if use nls ; then
-               cd po
-               emake DESTDIR="${D}"/usr DATADIR=share install || die "locales install failed"
-       fi
-}
-
-pkg_postinst() {
-       python_mod_optimize "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/${PN}"
-}
-
-pkg_postrm() {
-       python_version
-       python_mod_cleanup "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/${PN}"
-}

diff --git a/app-misc/fslint/fslint-2.42.ebuild b/app-misc/fslint/fslint-2.42.ebuild
new file mode 100644 (file)
index 0000000..625ffd3
--- /dev/null
+++ b/app-misc/fslint/fslint-2.42.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+PYTHON_DEPEND="2"
+
+inherit eutils python
+
+DESCRIPTION="A utility to find various forms of lint on a filesystem"
+HOMEPAGE="http://www.pixelbeat.org/fslint/"
+SRC_URI="http://www.pixelbeat.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND="dev-python/pygtk:2"
+
+src_prepare() {
+       python_convert_shebangs -r 2 .
+       # change some paths to make fslint-gui run when installed in /usr/bin
+       sed -e "s:^liblocation=.*$:liblocation='${EROOT}usr/share/${PN}' #Gentoo:" \
+               -e "s:^locale_base=.*$:locale_base=None #Gentoo:" \
+               -i fslint-gui || die "sed failed"
+}
+
+src_install() {
+       # the only sane way of installing dozens of files, most (but not all!)
+       # of them executable scripts, spread over multiple subdirectories
+       dodir /usr/share/${PN}
+       cp -R ${PN}/ "${ED}"/usr/share/${PN} || die "cp failed"
+
+       insinto /usr/share/${PN}
+       doins ${PN}{.glade,.gladep,_icon.png} || die "doins failed"
+
+       dobin ${PN}-gui || die "dobin failed"
+
+       doicon ${PN}_icon.png || die "doicon failed"
+       domenu ${PN}.desktop || die "domenu failed"
+
+       dodoc doc/{FAQ,NEWS,README,TODO} || die "dodoc failed"
+       doman man/{fslint.1,fslint-gui.1} || die "doman failed"
+
+       if use nls ; then
+               cd po
+               emake DESTDIR="${D}" install || die "locales install failed"
+       fi
+}