app-misc/bsc: Version bump and extensive cleanup.

svn path=/sunrise/; revision=10906

4 files changed, 51 insertions, 45 deletions

diff --git a/app-misc/bsc/ChangeLog b/app-misc/bsc/ChangeLog
index fe1ab0d88..e8fab2a78 100644
--- a/app-misc/bsc/ChangeLog
+++ b/app-misc/bsc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*bsc-4.1.0 (02 Jul 2010)
+
+  02 Jul 2010; Michał Górny (sedzimir) <mgorny.3ehbo@mailnull.com>
+  -bsc-4.0.06_beta.ebuild, +bsc-4.1.0.ebuild:
+  Version bump and extensive cleanup.
+
   23 Jun 2010; Markos Chandras <hwoarang@gentoo.org> bsc-4.0.06_beta.ebuild:
   Drop dependency to Qt4 metapackage
 
diff --git a/app-misc/bsc/Manifest b/app-misc/bsc/Manifest
index 7f1a12920..3186fa752 100644
--- a/app-misc/bsc/Manifest
+++ b/app-misc/bsc/Manifest
@@ -1,4 +1,4 @@
-DIST bsc_4.0.06.beta_src.tar.gz 114731 RMD160 d78a2dc0ab64bf72b2aad2ae1efb73b9d8c63fee SHA1 b1123850fc2ce4cbc08951087a363b7aef514421 SHA256 2b868c2879d040c10a8226261599ff828ca55a49def980289e8be12615162c5d
-EBUILD bsc-4.0.06_beta.ebuild 1020 RMD160 6e70cd455fd52cc14d568d3e6dd58609a41f6df7 SHA1 623dcbc53906789b014d21d856401f34bc074dd9 SHA256 01b92dabd998b6f690e323c1111f5e58e90df8ad66ea9ae96b6fd47cbc685206
-MISC ChangeLog 1783 RMD160 67dd1d1e856f8e0b511fd7e1688914913ddbbda6 SHA1 1e528d1a0924d0316f0393563e17fd5a989180e4 SHA256 0ac1d4803a3c0229acaa86d9faac846968845453ce7c04788989c328f1849f79
+DIST bsc_4.1.0_src.tar.bz2 108059 RMD160 77b8a05be87dcc6c96a7bfa35c7ef11500022998 SHA1 557842582bf5d93fc4f48d90eebdaece93d0261f SHA256 a07c26c64a251051be43d403359f1ac1675e0a16e2f19a84dee446b31a183393
+EBUILD bsc-4.1.0.ebuild 896 RMD160 57ed6ad66a1980bdad2f526068728fa96b6b4385 SHA1 7f158899befd072d65a555f94b750d7818a9bb0b SHA256 2eba2049650b9eb45f5407f0a72c35ee7845b5a04308adadf7de4678d63c1e5b
+MISC ChangeLog 1963 RMD160 36fa63331b471e6d5f3164d2c61b46b1f77c7b22 SHA1 f2fe5cb9de8ca5caf5df558be99745341de7d2ca SHA256 6ea45a11748ecda3c5595daca7d41ef1f4ba43e2935ee15d61519f8d9c5777b4
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/app-misc/bsc/bsc-4.0.06_beta.ebuild b/app-misc/bsc/bsc-4.0.06_beta.ebuild
deleted file mode 100644
index c924f7a79..000000000
--- a/app-misc/bsc/bsc-4.0.06_beta.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils qt4-r2 versionator
-
-MY_PV="$(replace_version_separator 3 '.')"
-DESCRIPTION="BSCommander is a Qt based file manager"
-HOMEPAGE="http://www.beesoft.org/index.php?id=bsc"
-SRC_URI="http://www.beesoft.org/download/${PN}_${MY_PV}_src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="x11-libs/qt-gui:4
-	x11-libs/libX11
-	x11-libs/libXext"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	sed -i -e "/^CXXFLAGS.*/s:-pipe -O4:${CXXFLAGS}:" \
-		Makefile || die "sed failed on Makefile"
-	sed -i -e "/^QMAKE_CXXFLAGS_RELEASE.*/s:-O4:${CXXFLAGS}:" \
-		${PN}.pro || die "sed failed on ${PN}.pro"
-}
-
-src_install() {
-	dobin ${PN} || die "dobin failed"
-
-	insinto /usr/share/${PN}
-	# shouldn't it be dohtml?
-	doins help.en.html || die "doins failed"
-
-	newicon BeesoftCommander.png ${PN}.png
-	make_desktop_entry ${PN} BSCommander ${PN} "FileManager;Utility;Qt"
-}
diff --git a/app-misc/bsc/bsc-4.1.0.ebuild b/app-misc/bsc/bsc-4.1.0.ebuild
new file mode 100644
index 000000000..b3bc7a9cf
--- /dev/null
+++ b/app-misc/bsc/bsc-4.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Qt-based file manager"
+HOMEPAGE="http://www.beesoft.org/index.php?id=bsc"
+SRC_URI="http://www.beesoft.org/download/${PN}_${PV}_src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-libs/qt-gui:4
+	x11-libs/libX11
+	x11-libs/libXext"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	default
+
+	# Drop forced CXXFLAGS
+	sed -i -e "/^QMAKE_CXXFLAGS_RELEASE/d" ${PN}.pro || die
+	# Set up the help file path
+	sed -i \
+		-e "s;QApplication::applicationDirPath();\"/usr/share/doc/${PF}/html\";" \
+		QBtHelp.cpp || die
+}
+
+src_install() {
+	dobin ${PN} || die
+	dohtml help.en.html || die
+
+	newicon BeesoftCommander.png ${PN}.png || die
+	make_desktop_entry ${PN} BSCommander ${PN} "FileManager;Utility;Qt"
+}