[gentoo-commits] proj/qt:master commit in: net-misc/kontrolpack/

["Markos Chandras" <hwoarang@gentoo.org>]

commit:     ea7f7ab5595689c48584adac9b8408596a391000
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  5 11:31:42 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 11:31:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ea7f7ab5

net-misc/kontrolpack: Version bump.

Patch by Michael (kensington) <gentoo <AT> scribeofthenile.com>

---
 net-misc/kontrolpack/Manifest                 |    2 +-
 net-misc/kontrolpack/kontrolpack-2.0.5.ebuild |   45 -----------------------
 net-misc/kontrolpack/kontrolpack-3.0.0.ebuild |   47 +++++++++++++++++++++++++
 net-misc/kontrolpack/kontrolpack-9999.ebuild  |   43 ++++++++++++----------
 4 files changed, 71 insertions(+), 66 deletions(-)

diff --git a/net-misc/kontrolpack/Manifest b/net-misc/kontrolpack/Manifest
index ee43b8f..d09cd7b 100644
--- a/net-misc/kontrolpack/Manifest
+++ b/net-misc/kontrolpack/Manifest
@@ -1 +1 @@
-DIST KontrolPack-2.0.5.tar.gz 558452 RMD160 c8d765f13682ff4061d52340ec94d927f2daef77 SHA1 914b8ef1642b6f4f7c0e974ee4c1d53d4ac45b39 SHA256 9867b7befb4ef10ca568e62f55915439eb7ccdf562feb17c397b20e5133cef61
+DIST KontrolPack-3.0.0.tar.gz 410115 SHA256 fb497081d4ca441801a84255a5eb13fedbc3c41e9e26cb509a5465cd8e00bcd7 SHA512 3ad5c7aa14493b78c6ee6226b9928817b6da82b125b9ac73b7b862a556b2c666db75e6ba4d9a654194d8b27e9a23dd1cf0e240e4d295f443968750b647ddaa43 WHIRLPOOL 79c620ec39dd0d61e2cb1316a6779f57ec2327b68e1ee11a907b1ed2e453197c1e8c1967a838ceb6913402bc91baff391866f434d4f161012cb93afaacab4989

diff --git a/net-misc/kontrolpack/kontrolpack-2.0.5.ebuild b/net-misc/kontrolpack/kontrolpack-2.0.5.ebuild
deleted file mode 100644
index b6c695f..0000000
--- a/net-misc/kontrolpack/kontrolpack-2.0.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-LANGS="fr"
-
-inherit qt4-edge
-
-MY_PN="KontrolPack"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Remote shell command executor and LAN manager"
-HOMEPAGE="http://www.kontrolpack.com"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug"
-
-DEPEND=">=x11-libs/qt-gui-4.5"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i -e "s!\(${MY_PN}_\)!/usr/share/${PN}/locale/\1!" main/main.cpp \
-		|| die "sed failed"
-}
-
-src_install() {
-	dobin "${PN}" || die "installing binary failed"
-
-	domenu "${PN}.desktop" || die "installing desktop file failed"
-	doicon "${PN}.png" || die "installing icon file failed"
-
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} ${LANGS}; then
-			insinto /usr/share/${PN}/locale
-			doins "langs/${MY_PN}_${lingua}.qm" || die "installing translations failed"
-		fi
-	done
-}

diff --git a/net-misc/kontrolpack/kontrolpack-3.0.0.ebuild b/net-misc/kontrolpack/kontrolpack-3.0.0.ebuild
new file mode 100644
index 0000000..1eeaee4
--- /dev/null
+++ b/net-misc/kontrolpack/kontrolpack-3.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit eutils qt4-edge
+
+MY_PN="KontrolPack"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit subversion
+	ESVN_REPO_URI="http://${PN}.svn.sourceforge.net/svnroot/${PN}"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Remote shell command executor and LAN manager"
+HOMEPAGE="http://www.kontrolpack.com"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+DEPEND="dev-db/sqlite
+	dev-libs/libxml2
+	dev-libs/openssl
+	>=x11-libs/qt-core-4.5:4
+	>=x11-libs/qt-gui-4.5:4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e "s/-lssl/-lcrypto/" libsecuretcp/libsecuretcp.pro \
+		|| die "sed failed"
+}
+
+src_install() {
+	dobin bin/${PN}
+	dolib bin/*.so*
+
+	doicon ${PN}/${PN}.png
+	domenu ${PN}/${PN}.desktop
+}

diff --git a/net-misc/kontrolpack/kontrolpack-9999.ebuild b/net-misc/kontrolpack/kontrolpack-9999.ebuild
index 0ea7ea2..1eeaee4 100644
--- a/net-misc/kontrolpack/kontrolpack-9999.ebuild
+++ b/net-misc/kontrolpack/kontrolpack-9999.ebuild
@@ -2,43 +2,46 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-LANGS="fr"
-
-inherit qt4-edge subversion
+inherit eutils qt4-edge
 
 MY_PN="KontrolPack"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit subversion
+	ESVN_REPO_URI="http://${PN}.svn.sourceforge.net/svnroot/${PN}"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="Remote shell command executor and LAN manager"
 HOMEPAGE="http://www.kontrolpack.com"
-ESVN_REPO_URI="http://${PN}.svn.sourceforge.net/svnroot/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug"
 
-DEPEND=">=x11-libs/qt-gui-4.5"
+DEPEND="dev-db/sqlite
+	dev-libs/libxml2
+	dev-libs/openssl
+	>=x11-libs/qt-core-4.5:4
+	>=x11-libs/qt-gui-4.5:4"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_PN}"
-
 src_prepare() {
-	sed -i -e "s!\(${MY_PN}_\)!/usr/share/${PN}/locale/\1!" main/main.cpp \
+	sed -i -e "s/-lssl/-lcrypto/" libsecuretcp/libsecuretcp.pro \
 		|| die "sed failed"
 }
 
 src_install() {
-	dobin "${PN}" || die "installing binary failed"
-
-	domenu "${PN}.desktop" || die "installing desktop file failed"
-	doicon "${PN}.png" || die "installing icon file failed"
+	dobin bin/${PN}
+	dolib bin/*.so*
 
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} ${LANGS}; then
-			insinto /usr/share/${PN}/locale
-			doins "langs/${MY_PN}_${lingua}.qm" || die "installing translations failed"
-		fi
-	done
+	doicon ${PN}/${PN}.png
+	domenu ${PN}/${PN}.desktop
 }