diff options
| -rw-r--r-- | dev-cpp/libcmis/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-cpp/libcmis/files/libcmis-0.2.2-docbook.patch | 27 | ||||
| -rw-r--r-- | dev-cpp/libcmis/libcmis-0.2.3.ebuild (renamed from dev-cpp/libcmis/libcmis-0.2.2.ebuild) | 12 | ||||
| -rw-r--r-- | dev-cpp/libcmis/libcmis-9999.ebuild | 10 | ||||
| -rw-r--r-- | dev-cpp/libcmis/metadata.xml | 3 |
5 files changed, 23 insertions, 38 deletions
diff --git a/dev-cpp/libcmis/ChangeLog b/dev-cpp/libcmis/ChangeLog index acb05da8727e..82a6b67c3e6c 100644 --- a/dev-cpp/libcmis/ChangeLog +++ b/dev-cpp/libcmis/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-cpp/libcmis # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/ChangeLog,v 1.9 2012/06/05 15:40:51 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/ChangeLog,v 1.10 2012/06/14 08:41:31 scarabeus Exp $ + +*libcmis-0.2.3 (14 Jun 2012) + + 14 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> +libcmis-0.2.3.ebuild, + -files/libcmis-0.2.2-docbook.patch, -libcmis-0.2.2.ebuild, + libcmis-9999.ebuild, metadata.xml: + Bump to latest and use the switches i added upstream. Remove broken one. *libcmis-0.2.2 (05 Jun 2012) diff --git a/dev-cpp/libcmis/files/libcmis-0.2.2-docbook.patch b/dev-cpp/libcmis/files/libcmis-0.2.2-docbook.patch deleted file mode 100644 index 2454ec56a06e..000000000000 --- a/dev-cpp/libcmis/files/libcmis-0.2.2-docbook.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 624adef..ed6adff 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = src doc -+SUBDIRS = src - ACLOCAL_AMFLAGS = -I m4 - - pcfiles = libcmis-@LIBCMIS_API_VERSION@.pc -diff --git a/configure.ac b/configure.ac -index b0c94cc..9d6aedc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -44,12 +44,6 @@ AC_PROG_MAKE_SET - AC_PROG_LIBTOOL - AC_LIBTOOL_WIN32_DLL - --# TODO Check for docbook-to-man --AC_CHECK_PROG(DOCBOOK2X,[docbook-to-man],[docbook2X]) --if test "x$DOCBOOK2X" = "x"; then -- AC_MSG_ERROR([docbook-to-man is missing. Install docbook2X package.]) --fi -- - AC_ARG_ENABLE([werror], - [AS_HELP_STRING([--disable-werror], [Treat all warnings as errors, usefull for development])], - [enable_werror="$enableval"], diff --git a/dev-cpp/libcmis/libcmis-0.2.2.ebuild b/dev-cpp/libcmis/libcmis-0.2.3.ebuild index 6a23b94f78cb..a612fd9a2a92 100644 --- a/dev-cpp/libcmis/libcmis-0.2.2.ebuild +++ b/dev-cpp/libcmis/libcmis-0.2.3.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-0.2.2.ebuild,v 1.1 2012/06/05 15:40:51 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-0.2.3.ebuild,v 1.1 2012/06/14 08:41:31 scarabeus Exp $ EAPI=4 EGIT_REPO_URI="git://gitorious.org/libcmis/libcmis.git" [[ ${PV} == 9999 ]] && SCM_ECLASS="git-2" -inherit eutils autotools ${SCM_ECLASS} +inherit autotools ${SCM_ECLASS} unset SCM_ECLASS DESCRIPTION="C++ client library for the CMIS interface" @@ -15,8 +15,8 @@ HOMEPAGE="https://sourceforge.net/projects/libcmis/" LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )" SLOT="0" -[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="static-libs test" +[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="static-libs man test" RDEPEND=" dev-libs/boost @@ -24,6 +24,7 @@ RDEPEND=" net-misc/curl " DEPEND="${RDEPEND} + man? ( app-text/docbook2X ) test? ( dev-util/cppunit ) " @@ -31,14 +32,13 @@ DEPEND="${RDEPEND} RESTRICT="test" src_prepare() { - # docbook2X everyitme for one manpage, nope nope - epatch "${FILESDIR}/${PN}-0.2.2-docbook.patch" eautoreconf } src_configure() { econf \ --disable-werror \ + $(use_with man) \ $(use_enable static-libs static) \ $(use_enable test tests) \ --enable-client diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild index df1a6f457573..93d36a627a2a 100644 --- a/dev-cpp/libcmis/libcmis-9999.ebuild +++ b/dev-cpp/libcmis/libcmis-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-9999.ebuild,v 1.4 2011/12/09 13:28:55 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-9999.ebuild,v 1.5 2012/06/14 08:41:31 scarabeus Exp $ EAPI=4 @@ -15,8 +15,8 @@ HOMEPAGE="https://sourceforge.net/projects/libcmis/" LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )" SLOT="0" -[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="static-libs test" +[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="static-libs man test" RDEPEND=" dev-libs/boost @@ -24,6 +24,7 @@ RDEPEND=" net-misc/curl " DEPEND="${RDEPEND} + man? ( app-text/docbook2X ) test? ( dev-util/cppunit ) " @@ -37,6 +38,7 @@ src_prepare() { src_configure() { econf \ --disable-werror \ + $(use_with man) \ $(use_enable static-libs static) \ $(use_enable test tests) \ --enable-client diff --git a/dev-cpp/libcmis/metadata.xml b/dev-cpp/libcmis/metadata.xml index fb56680f3630..572572c9f461 100644 --- a/dev-cpp/libcmis/metadata.xml +++ b/dev-cpp/libcmis/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>openoffice</herd> +<use> + <flag name='man'>Build and install man pages.</flag> +</use> </pkgmetadata> |