Revision bump: EAPI 5, proper handling of python-related stuff, wrt bug #315307, drop old revision

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 60 insertions, 47 deletions

diff --git a/net-irc/irssi-otr/ChangeLog b/net-irc/irssi-otr/ChangeLog
index 131198348ccf..32d5e30f1d5d 100644
--- a/net-irc/irssi-otr/ChangeLog
+++ b/net-irc/irssi-otr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/irssi-otr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-otr/ChangeLog,v 1.12 2013/06/01 14:42:58 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-otr/ChangeLog,v 1.13 2013/07/25 23:34:32 pinkbyte Exp $
+
+*irssi-otr-0.3-r1 (25 Jul 2013)
+
+  25 Jul 2013; Sergey Popov <pinkbyte@gentoo.org> -irssi-otr-0.3.ebuild,
+  +irssi-otr-0.3-r1.ebuild:
+  Revision bump: EAPI 5, proper handling of python-related stuff, wrt bug
+  #315307, drop old revision
 
   01 Jun 2013; Chris Reffett <creffett@gentoo.org> irssi-otr-0.2.ebuild:
   EAPI bump wrt bug 460572
diff --git a/net-irc/irssi-otr/Manifest b/net-irc/irssi-otr/Manifest
index 3e5522d3867e..fa425cd83fd3 100644
--- a/net-irc/irssi-otr/Manifest
+++ b/net-irc/irssi-otr/Manifest
@@ -4,15 +4,17 @@ Hash: SHA256
 DIST irssi-otr-0.2.tar.gz 28618 SHA256 fbdf4375056cf5122e7aebd624364d1201f7c7473e1876f2c28dd009b7628c11 SHA512 03ddec87c5fea0e3ad60fafdcebd49340978f41dc8bf9fb5918d90aca61d1fa69634b2304b46b25822f00e3bd258e0953d8d9436384e5bfee036f36d512b08aa WHIRLPOOL d7ff7057feec54b7de48aa4d13710d3894eada1c0b5f80d324f8007b69e3e50f3e7f0976837bb129a7cf1837ff55d6960300677cf6c0d5e0673d57fff32115ec
 DIST irssi-otr-0.3.tar.gz 33514 SHA256 816cb13794c0efa33ee1618a4e926b3f1c3587c675ad3cc44b4f8de3b1b2c60e SHA512 3a3ad788b94887c6bedf6b172cd2267ac4d88fa4a78f7d2c5a8728ea9cb261339bbae1e975cbf44e5d1ec557865342cafc8beb716887ffd92742a9cd407e9f8f WHIRLPOOL ed0100ac58fa23a87b60fe5205bcd8469573df0432d9a4d9b40ddc2ba919db4a169b2cbc3410b8690f0b57e49f42e2c7f0dd46e66c8139f4c94528f6b30bf0f5
 EBUILD irssi-otr-0.2.ebuild 942 SHA256 61e68fa4396c7ab7703974789e335f95796a3999295561c2511576d9530ab7e1 SHA512 fc63bd36004e77b6e003fd422f501a291e0f92b8c00f62523290c8ddbe20b8ce0dd5438871e84f9dbafc0e197f91d1c9c8e48c9d90590714237fadf9bc2f95d8 WHIRLPOOL d58e96813023da495976718e52eb9a056f3fc92376d1db3a771e600507f1fe4d38d473158d588607fd3170abb3982ec29304006fc2de09b749e47ed988c9d724
-EBUILD irssi-otr-0.3.ebuild 918 SHA256 b8736f9166871cb8e981b12bae4f5a3d6d7203c0651a758e823fbb6d0c27062f SHA512 dc3b43cf94be775c1acfcf533934826c6f842ede7ea6048468b6dcb1aa0cae5c8337ff5ce2ffd220b56dd83684bb1b697437f8860f3accfbbd67508ae03737f6 WHIRLPOOL c682a0937e6149b54767942e2133ded19b804a3472ee81fee1a92a30e3a8441e70b6313ee735f0fab9d0799a4dee256babec3706f1b2f7814853d1cf1cbdcb52
-MISC ChangeLog 1749 SHA256 1449470a00e1a92f11dd0c68ef5cf8d97fbccb8bf22b9d57342015ca64a467c7 SHA512 064ea40ae572265bccfd16d6f08642bffc45d0821619d87315195bb781c2f6e8e8f92ade9fb154251d41bb1214902c83963a2456f29b6167a4ddc2c1b90cd9fc WHIRLPOOL 3e1839b5c228f5c82eacbf302e07059fedc7bd613c0d2184e4f81559df4db7a7d86714f1cac6e87da71610d2b587302d62a478ef01371bc725ebd9a2983682ff
+EBUILD irssi-otr-0.3-r1.ebuild 992 SHA256 65d3e06e6e5ce19fc1fec22683a961c14bfa630a20e234780c25fa247c3226d0 SHA512 0915f9ef3aeb5d5aa6fc8c54371a0ba69da4afa30f9793ad5426070a7082229fbce5247cc0d272a6627f8b7b7c85327063696c6c23aa24de9fddb5324ef4a029 WHIRLPOOL ad3455420e5b6351846a253d083c94da446a92f2e3958654bf7a4f819e63d9ab0efefe96e9cc6ecdd4af35b90f4e3d637b7ec95438f797a175776638a754ff40
+MISC ChangeLog 1987 SHA256 ad4086149a6dc78427bd01afc42128b00877fb1f46c3cc84588672db3081bb92 SHA512 3585917ab811756de48b1f870cf990aa7717cdccf791055e16057547aa261801da242719c256b1ac9ba062147745c7237bfb593958c2a34275a0ece9e6b83e10 WHIRLPOOL ae1a6a4e71027764142c1486bddd416ba8a8ff28d5682ccbbff4117b666bc1b7e1dda48798305957494cef3a8029b6644bab29e30c5fce0ff68b88479ebf2dc2
 MISC metadata.xml 426 SHA256 856ef1140c1ea14de5cfd7fc5ed13654de0dfb504fc4d1ebe7cdbc30cfa94ee9 SHA512 c2e076ec5580bc93bf0d1181ed405813e2e43dce11434bdce93e5e3dfe4720396d0c01b9f5697b628fa249ca7c1b6d39b63add84b7f2a39ca33a549b252ec9a7 WHIRLPOOL 803dccd06b8330809b0274d357546b8db810dea14008036bb29ada6dd6433e045e5f5685e2e82c3779bbb74dd9a0078dc3a0dc67dd17703cc349c84894841c40
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iKYEAREIAGYFAlGqCGVfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1TyrgCggJAv4J8Pz6oEkPwCAFpbWKa/
-AEgAnjv1EA1mDN9HdaCwLE6jFe4+j5g1
-=Syvb
+iQEcBAEBCAAGBQJR8bYKAAoJECo/aRed9267Lc0H/0GCgMFmaOmNAuzt4vrKtxk5
+RrppA+ixcUbWGjoc0umzqD4d+XE7FOuVc6EKsFmg7GMD9BEGn1YPsAeqPOhQUyXd
+mrYrtxrDQSAXulpSj1+68nVTcOL5jXlZLcuINtP68Cv/SXdtACFzzWsfM46ReX9P
+ITJkUSS29jIykuLMJHnuaIwiVG8xSHDn7aau7PtSzUN47u+qqh0yDE6JvBqhQq1e
+vU+Z0v0lz8kkEMicfocneuss/zU7XxklErDINxzWxK83BiMcddgHuQcOw68cKhHb
+El1jU/P/dQCIX2tLumSCc+QywznYWMVVMOgalcsK0tEiwpYLqoQvOfZe8PrIJ1w=
+=YT04
 -----END PGP SIGNATURE-----
diff --git a/net-irc/irssi-otr/irssi-otr-0.3-r1.ebuild b/net-irc/irssi-otr/irssi-otr-0.3-r1.ebuild
new file mode 100644
index 000000000000..c8a2bc44ea70
--- /dev/null
+++ b/net-irc/irssi-otr/irssi-otr-0.3-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-otr/irssi-otr-0.3-r1.ebuild,v 1.1 2013/07/25 23:34:32 pinkbyte Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2} )
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="Off-The-Record messaging (OTR) for irssi"
+HOMEPAGE="http://irssi-otr.tuxfamily.org"
+SRC_URI="ftp://download.tuxfamily.org/irssiotr/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND="net-libs/libotr
+	dev-libs/glib:2
+	dev-libs/libgcrypt
+	dev-libs/libgpg-error
+	net-irc/irssi"
+
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( README )
+
+src_prepare() {
+	# do not install docs through buildsystem
+	sed -i -e '/README LICENSE/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOCDIR="/usr/share/doc/${PF}"
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-irc/irssi-otr/irssi-otr-0.3.ebuild b/net-irc/irssi-otr/irssi-otr-0.3.ebuild
deleted file mode 100644
index b7570c3ab883..000000000000
--- a/net-irc/irssi-otr/irssi-otr-0.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-otr/irssi-otr-0.3.ebuild,v 1.5 2012/05/03 06:27:14 jdhore Exp $
-
-EAPI=2
-inherit cmake-utils
-
-DESCRIPTION="Off-The-Record messaging (OTR) for irssi"
-HOMEPAGE="http://irssi-otr.tuxfamily.org"
-
-# This should probably be exported by cmake-utils as a variable
-CMAKE_BINARY_DIR="${WORKDIR}"/${PN}_build
-mycmakeargs="-DDOCDIR=/usr/share/doc/${PF}"
-
-SRC_URI="ftp://download.tuxfamily.org/irssiotr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE="debug"
-
-RDEPEND="net-libs/libotr
-	dev-libs/glib:2
-	dev-libs/libgcrypt
-	dev-libs/libgpg-error
-	|| (
-		net-irc/irssi
-		net-irc/irssi-svn
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/python"
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/share/doc/${PF}/LICENSE
-	prepalldocs
-}