aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Parmer <maxp@trystero.is>2016-03-20 16:21:34 -0700
committerMax Parmer <maxp@trystero.is>2016-03-20 16:21:34 -0700
commitfce16affccdc279a49f262fcdb17be63f14e7e7d (patch)
tree241ecb1a937f3edf08cc52803af917523729aa1e
parent831d7d9ac4d19a84346a6e252b7f8bad767d1d45 (diff)
downloadprofanity-fce16affccdc279a49f262fcdb17be63f14e7e7d.tar.gz
profanity-fce16affccdc279a49f262fcdb17be63f14e7e7d.tar.xz
Upgrade to vanilla libstrophe 0.8.8
-rw-r--r--dev-libs/libstrophe/Manifest2
-rw-r--r--dev-libs/libstrophe/libstrophe-0.8.8.ebuild (renamed from dev-libs/libstrophe/libstrophe-0.8-r1.ebuild)26
2 files changed, 9 insertions, 19 deletions
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 6e28185..5902758 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1 +1 @@
-DIST libstrophe-0.8-snapshot.tar.gz 361141 SHA256 f9f6d6f2246f0d7a5d360e0c1d166724fd39b36bcf539199c3a8d7fe6d6a53ea SHA512 74732934db393994be4fe1d6bb989303009f602c71b5dbc730fc28e683c0ef27840f9fae4accb62c1d9dcaf2c55e69a7c8009db6c79d32d85997fbebbbcb513e WHIRLPOOL 3f1842665abbd270476a63eed31ef756fa510194ee49a8f3c8e48172867aa0b1ac52aa4dd63b74c86ec682a2684519719e0e3467076ea5aab28cc3dc29137051
+DIST 0.8.8.tar.gz 128385 SHA256 08f4a85ef419a8bdf08b6afa8f7b2a0e5e180fdc9c16cede81af672ec10e21e7 SHA512 fe1e9ee0ea93271862ca8bd3cd5cd66d0bd060398f3b11a242158872501ab517f4f436e474dd5603d73433333d4aaf0957d68b7fe69578d7d99541aaa63a38a3 WHIRLPOOL 684ecd641c8b8bac92218dc551f9fa1f5e42148cc832e43db2a5accee014d84a00899da05d41e75572a0102dfe139e165092f46e1e8866a7003f852e8ed6bdb7
diff --git a/dev-libs/libstrophe/libstrophe-0.8-r1.ebuild b/dev-libs/libstrophe/libstrophe-0.8.8.ebuild
index e754817..18b6547 100644
--- a/dev-libs/libstrophe/libstrophe-0.8-r1.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.8.8.ebuild
@@ -2,33 +2,27 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=5
-inherit eutils
+inherit autotools eutils
DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
HOMEPAGE="http://strophe.im/libstrophe/"
-SRC_URI="mirror://github/metajack/${PN}/${P}-snapshot.tar.gz"
+SRC_URI="https://github.com/strophe/${PN}/archive/${PV}.tar.gz"
LICENSE="MIT GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc xml"
RDEPEND="xml? ( dev-libs/libxml2 )
!xml? ( dev-libs/expat )
- dev-libs/openssl"
+ dev-libs/openssl:0"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
-S="${WORKDIR}/${P}-snapshot"
-
src_prepare() {
- epatch "${FILESDIR}"/${PN}-xmpp-conn-disable-tls.patch
- epatch "${FILESDIR}"/${PN}-fix-memory-leaks.patch
- epatch "${FILESDIR}"/${PN}-fix-memory-leak-in-logging.patch
- epatch "${FILESDIR}"/${PN}-fix-crash-on-non-latin1.patch
- epatch "${FILESDIR}"/${PN}-xml-escape.patch
+ eautoreconf
}
src_configure() {
@@ -37,14 +31,10 @@ src_configure() {
use xml || econf
}
-src_compile() {
- emake
+src_install() {
+ emake DESTDIR="${D}" install
if use doc; then
doxygen || die
fi
-}
-
-src_install() {
- einstall
use doc && dohtml -r docs/html/*
}