diff options
| author | megabaks <megagreener@gmail.com> | 2012-10-09 04:10:58 -0700 |
|---|---|---|
| committer | megabaks <megagreener@gmail.com> | 2012-10-09 04:10:58 -0700 |
| commit | 758f2f0f75b53588248134148c716cd6ae06c9d5 (patch) | |
| tree | 9c440bbd89ec1a7c42a1678164b270833d62460c | |
| parent | adb90c98fb2e26b9d02195527729f45c120f51bb (diff) | |
| parent | 19f2c172e05e15737f1df6a91bffb37f32df0497 (diff) | |
| download | profanity-758f2f0f75b53588248134148c716cd6ae06c9d5.tar.gz profanity-758f2f0f75b53588248134148c716cd6ae06c9d5.tar.xz | |
Merge pull request #19 from pasis/master
dev-libs/libstrophe
| -rw-r--r-- | dev-libs/libstrophe/files/libstrophe-libxml2-build-fix.patch | 18 | ||||
| -rw-r--r-- | dev-libs/libstrophe/libstrophe-9999.ebuild | 31 |
2 files changed, 41 insertions, 8 deletions
diff --git a/dev-libs/libstrophe/files/libstrophe-libxml2-build-fix.patch b/dev-libs/libstrophe/files/libstrophe-libxml2-build-fix.patch new file mode 100644 index 0000000..c7d6757 --- /dev/null +++ b/dev-libs/libstrophe/files/libstrophe-libxml2-build-fix.patch @@ -0,0 +1,18 @@ +diff --git a/configure.ac b/configure.ac +index 97444e5..e170fc3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9,11 +9,9 @@ AC_CHECK_HEADER(openssl/ssl.h, [], [AC_MSG_ERROR([couldn't find openssl headers, + PKG_CHECK_MODULES([check], [check >= 0.9.4], [], [AC_MSG_WARN([libcheck not found; unit tests will not be compilable])]) + + AC_ARG_WITH([libxml2], +- [AS_HELP_STRING([--with-libxml2], [use libxml2 for XML parsing])], +- [with_libxml2=check], +- [with_libxml2=no]) ++ [AS_HELP_STRING([--with-libxml2], [use libxml2 for XML parsing])]) + +-if test "x$with_libxml2" != xno; then ++if test "x$with_libxml2" = xyes; then + PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.7], + [with_libxml2=yes], + [AC_MSG_ERROR([couldn't find libxml2])]) diff --git a/dev-libs/libstrophe/libstrophe-9999.ebuild b/dev-libs/libstrophe/libstrophe-9999.ebuild index 8ef44dc..5b4ae9d 100644 --- a/dev-libs/libstrophe/libstrophe-9999.ebuild +++ b/dev-libs/libstrophe/libstrophe-9999.ebuild @@ -6,7 +6,7 @@ EAPI=4 EGIT_REPO_URI="git://github.com/metajack/libstrophe.git" -inherit autotools git-2 +inherit autotools eutils git-2 DESCRIPTION="A simple, lightweight C library for writing XMPP clients" HOMEPAGE="http://strophe.im/libstrophe" @@ -14,19 +14,34 @@ HOMEPAGE="http://strophe.im/libstrophe" LICENSE="MIT GPL-3" SLOT="0" KEYWORDS="" -IUSE="xml" +IUSE="doc xml" -DEPEND="xml? ( dev-libs/libxml2 ) - !xml? ( dev-libs/expat ) - dev-libs/openssl" -RDEPEND="${DEPEND}" +RDEPEND="xml? ( dev-libs/libxml2 ) + !xml? ( dev-libs/expat ) + dev-libs/openssl" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" S="${WORKDIR}/${P/-/_}" src_prepare() { - eautoreconf + epatch "${FILESDIR}"/${PN}-libxml2-build-fix.patch + eautoreconf } src_configure() { - econf $(use_with xml libxml2) + econf $(use_with xml libxml2) +} + +src_compile() { + emake + if use doc; then + doxygen || die + fi +} + +src_install() { + einstall + dodoc LICENSE.txt README.markdown + use doc && dohtml -r docs/html/* } |