summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/pidgin-sipe/ChangeLog8
-rw-r--r--x11-plugins/pidgin-sipe/Manifest4
-rw-r--r--x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0-r1.ebuild (renamed from x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0.ebuild)11
3 files changed, 14 insertions, 9 deletions
diff --git a/x11-plugins/pidgin-sipe/ChangeLog b/x11-plugins/pidgin-sipe/ChangeLog
index 67c60622322a..5bd13ff8b7bf 100644
--- a/x11-plugins/pidgin-sipe/ChangeLog
+++ b/x11-plugins/pidgin-sipe/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-plugins/pidgin-sipe
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/ChangeLog,v 1.26 2014/01/30 22:09:01 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/ChangeLog,v 1.27 2014/02/01 15:25:09 thev00d00 Exp $
+
+*pidgin-sipe-1.18.0-r1 (01 Feb 2014)
+
+ 01 Feb 2014; Ian Whyman <thev00d00@gentoo.org> +pidgin-sipe-1.18.0-r1.ebuild,
+ -pidgin-sipe-1.18.0.ebuild:
+ Drop required use and default to nss
*pidgin-sipe-1.18.0 (30 Jan 2014)
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index ae6c041b97b8..0657ef7ca359 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -2,6 +2,6 @@ AUX pidgin-sipe-1.13.2-fix-sandbox-r1.patch 855 SHA256 69fc95e9e05cfa17d7d12fc83
DIST pidgin-sipe-1.17.3.tar.gz 1078714 SHA256 8d781147b1717d4b697168a8f2f66c8760af574d6672ff828a9deb8760d388d4 SHA512 f63d345fdb74759ea99a4c84c937cf448b9d9980beef3dcfbb657a9ab92e1851d6af669cc680fcb1808a539059e2312d18fdf2a92273e0334f72583a394a5030 WHIRLPOOL 2c7510bbaeac2a61ed77a419f61ba105ac1bb0770e230974b4ca11e05bc55382ec68b7d7c2cce2ecac327845eccbf1b31fe4db5615db8a6d23f2a6c425d910db
DIST pidgin-sipe-1.18.0.tar.gz 1090904 SHA256 f1388799e3d250fe43643ee8748a6769f67f9c544e3b91fbb25af76b30675efc SHA512 f7d50b26656cd83f13ee24412ca97ab5ffe325c13d32855f9e8c788d5c8a11cb942c12d6888c4992c037320500265441eba9bc8e4eb5c21190eb372abd6b4451 WHIRLPOOL c97693bf54b0dba3f583891714edb63971b2669d1fc0ed41eb94009cfa2b78e37fdee42db325c74f4e4fc76cf29af5fd7cc67b598a3d672623ec1c392561ba86
EBUILD pidgin-sipe-1.17.3.ebuild 1399 SHA256 f1c8bdf7b3eb3c053c4e973d3654a140c8b07f290bd0b6123be7940bd2db4350 SHA512 cfc8884f663a82bd7ee6c1a393fd6ac41c32f91ade307fb76079863875fbecbb9917045b8a5ceca01f74e6e9e7694e0ed574b833a22a28e716d27c2522aea88c WHIRLPOOL 3af37ea5177b7a898467bb0454cbea95799e6ab09766ede3bd271d59497476eef1b13f3c02d773a3c92c2465b2a3670badc1ba7559b77388711fe6319e3ee430
-EBUILD pidgin-sipe-1.18.0.ebuild 1518 SHA256 fedb09e2fb9367df47164ebb04d8e38f19724faf852c6c8fac7aa6ddf370054a SHA512 d6c0fcc3f28485164cebb3b1ec2820f73b5f58289138231ba5763fba90f0db3c83479fd71980dc9179c8020901231ea5b472cfa198159898d232067cd80e2af6 WHIRLPOOL 1e5325ec72a1bd19fe900744f050d34d0afcfdb846647e4788474a7892f05fd7e5c6b5e4527fd31be9bc2237cc613b607286a6b43253c15596e1c249fbe73281
-MISC ChangeLog 4755 SHA256 c6069cb45005a6545d202249fd35ae804d2a9ac3bfc44ed2812d203bad7bad70 SHA512 046a660b6af708a1bcca06b58b4554b0b8408873651f58ad35d73a8978b08855843c34cb1e6f445edaaed4074f46d044462998e17169cf52f7fd2c81ec978be6 WHIRLPOOL 310671f83653ea17344f9adceb8bbe6d8d7056c01cf657703f7df03ef4077b732c29de13e372bc5c0f3395ac4aea0853c6de27ba87dc22012093f15759dac31e
+EBUILD pidgin-sipe-1.18.0-r1.ebuild 1497 SHA256 c149fcc6468d42ac476360dc7c7a929f0e8a80e3250046b792f8c3690791ac3e SHA512 db6d430ad0592bf70f374ba5256d00f8a4a08897f9340ba75d246bf8cee47294f8cc0fb7f87563693cab34eca7e4ff2981dcb63dde4c0709f773ff40a481a4ab WHIRLPOOL bafe0cb8166f463071c8272b730ec3eaff1c9c2bdead4a49c4f05213358477cfb68cb7c589aa9a4cd1c535731e86e3f3930efef024ae171a478844b4c742b15b
+MISC ChangeLog 4943 SHA256 e60c845d56c42b0525efdca263550b1c7b995da6c94823b7e387764f7a3ca6b9 SHA512 5131c0a8f08e12cb237b8f93a375a6c22e62226ffe0961e5dca4d1169b8e517509d5c443f79072669880f6e14d9ca90efcef8ffadac28eeee7d344218fdea5fd WHIRLPOOL 86df3a990542ba92900e229ec10d1b3e78486841b0f274ada14db4c9520bd3c66004bfcead160fca1c252a910ea6ef597ea71f504d2a50970ad8ded03bd2076c
MISC metadata.xml 844 SHA256 ca0c44bdfcdf9aa5913b1cab012719e34fceaca4995d935dc0a5d4df2c61a36a SHA512 738d70c3412ba4fb98606c4e1d31c2dc1a1829e9898df5758b45f22571827bc94b67e360a4aac7da7a480b92ebd869117c907316ffeb864c8603c4e4b57030a5 WHIRLPOOL d46e91e630092c478350fc5cbfd963d73e4e8bab2a74bff9b1285f7712cbf363a7695550b4271a8f82694059627e53beed88da97105ac7e99700657d3a508923
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0-r1.ebuild
index c014f765f5ae..2b0bf66b2a4b 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0.ebuild,v 1.1 2014/01/30 22:09:01 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-sipe/pidgin-sipe-1.18.0-r1.ebuild,v 1.1 2014/02/01 15:25:09 thev00d00 Exp $
EAPI=5
@@ -14,13 +14,12 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug kerberos nss ocs2005-message-hack openssl telepathy voice"
-REQUIRED_USE="^^ ( openssl nss )"
+IUSE="debug kerberos ocs2005-message-hack openssl telepathy voice"
RDEPEND=">=dev-libs/gmime-2.4.16
dev-libs/libxml2
- nss? ( dev-libs/nss )
openssl? ( dev-libs/openssl )
+ !openssl? ( dev-libs/nss )
kerberos? ( virtual/krb5 )
voice? (
>=dev-libs/glib-2.28.0
@@ -59,8 +58,8 @@ src_configure() {
$(use_enable ocs2005-message-hack) \
$(use_with kerberos krb5) \
$(use_with voice vv) \
- $(use_enable openssl) \
- $(use_enable nss)
+ $(use_enable !openssl nss) \
+ $(use_enable openssl)
}
src_install() {