diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2013-07-24 21:13:49 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2013-07-24 21:13:49 +0000 |
commit | 2ac9ef16c425e7eff3b8ad7a4e4dcf07d2b4d8f2 (patch) | |
tree | 8c17e2488b17e9ee64fdc1d1b3f001385493f6fc /dev-libs | |
parent | layout.conf: explicitly specify empty masters (diff) | |
download | gentoo-2-2ac9ef16c425e7eff3b8ad7a4e4dcf07d2b4d8f2.tar.gz gentoo-2-2ac9ef16c425e7eff3b8ad7a4e4dcf07d2b4d8f2.tar.bz2 gentoo-2-2ac9ef16c425e7eff3b8ad7a4e4dcf07d2b4d8f2.zip |
Initial commit. Dep for zypper.
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/libzypp/ChangeLog | 10 | ||||
-rw-r--r-- | dev-libs/libzypp/files/libzypp-fix-compilation.patch | 56 | ||||
-rw-r--r-- | dev-libs/libzypp/files/libzypp-fix-tests.patch | 37 | ||||
-rw-r--r-- | dev-libs/libzypp/libzypp-13.3.0.ebuild | 58 | ||||
-rw-r--r-- | dev-libs/libzypp/metadata.xml | 9 |
5 files changed, 170 insertions, 0 deletions
diff --git a/dev-libs/libzypp/ChangeLog b/dev-libs/libzypp/ChangeLog new file mode 100644 index 000000000000..b5af59263134 --- /dev/null +++ b/dev-libs/libzypp/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for dev-libs/libzypp +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzypp/ChangeLog,v 1.1 2013/07/24 21:13:49 scarabeus Exp $ + +*libzypp-13.3.0 (24 Jul 2013) + + 24 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> + +files/libzypp-fix-compilation.patch, +files/libzypp-fix-tests.patch, + +libzypp-13.3.0.ebuild, +metadata.xml: + Initial commit. Dep for zypper. diff --git a/dev-libs/libzypp/files/libzypp-fix-compilation.patch b/dev-libs/libzypp/files/libzypp-fix-compilation.patch new file mode 100644 index 000000000000..90d0899c0b0a --- /dev/null +++ b/dev-libs/libzypp/files/libzypp-fix-compilation.patch @@ -0,0 +1,56 @@ +From 361ec5d439b290e659cec63071f499fc0104401c Mon Sep 17 00:00:00 2001 +From: Tomas Chvatal <tomas.chvatal@gmail.com> +Date: Wed, 24 Jul 2013 22:38:55 +0200 +Subject: [PATCH] Fix mixing C and C++ in templates + +This kills the favorite error for some gcc versions about C in the +templates. + +*snip* +/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/include/g++-v4/bits/basic_string.tcc:1068:3: +error: template with C linkage +make[2]: *** [zypp/CMakeFiles/zypp.dir/parser/xml/Node.cc.o] Error 1 +*snip* + +Basically we don't need to put this stuff here as it is done in the +headers themselves, so just prune the problematic code. +--- + zypp/parser/xml/Node.cc | 3 --- + zypp/parser/xml/Reader.cc | 3 --- + 2 files changed, 6 deletions(-) + +diff --git a/zypp/parser/xml/Node.cc b/zypp/parser/xml/Node.cc +index e3ac4cd..c90b8e1 100644 +--- a/zypp/parser/xml/Node.cc ++++ b/zypp/parser/xml/Node.cc +@@ -9,11 +9,8 @@ + /** \file zypp/parser/xml/Reader.cc + * + */ +-extern "C" +-{ + #include <libxml/xmlreader.h> + #include <libxml/xmlerror.h> +-} + + #include <iostream> + +diff --git a/zypp/parser/xml/Reader.cc b/zypp/parser/xml/Reader.cc +index 4e514f4..d06be45 100644 +--- a/zypp/parser/xml/Reader.cc ++++ b/zypp/parser/xml/Reader.cc +@@ -9,11 +9,8 @@ + /** \file zypp/parser/xml/Reader.cc + * + */ +-extern "C" +-{ + #include <libxml/xmlreader.h> + #include <libxml/xmlerror.h> +-} + + #include <iostream> + +-- +1.8.1.5 + diff --git a/dev-libs/libzypp/files/libzypp-fix-tests.patch b/dev-libs/libzypp/files/libzypp-fix-tests.patch new file mode 100644 index 000000000000..90ced816a1f4 --- /dev/null +++ b/dev-libs/libzypp/files/libzypp-fix-tests.patch @@ -0,0 +1,37 @@ +From e0d745096444c0ee9b74068d07cb68d79caf07ec Mon Sep 17 00:00:00 2001 +From: Tomas Chvatal <tomas.chvatal@gmail.com> +Date: Wed, 24 Jul 2013 22:59:44 +0200 +Subject: [PATCH] Fix missing include of iostream +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As without it the test just happily fails to compile due to this: + +tests/zypp/Flags_test.cc:9:12: error: ‘std::cout’ has not been declared +--- + tests/zypp/Flags_test.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/zypp/Flags_test.cc b/tests/zypp/Flags_test.cc +index d6e4666..95dee3c 100644 +--- a/tests/zypp/Flags_test.cc ++++ b/tests/zypp/Flags_test.cc +@@ -4,6 +4,7 @@ + #include <boost/test/auto_unit_test.hpp> + #include "zypp/base/Logger.h" + #include "zypp/base/Flags.h" ++#include <iostream> + + using boost::unit_test::test_case; + using std::cout; +@@ -80,4 +81,4 @@ BOOST_AUTO_TEST_CASE(flags) + t.unsetFlag( T_2 ); BOOST_CHECK( t.testFlag( T_1 ) ); + t.setFlag( T_1, false ); BOOST_CHECK( t.testFlag( T_0 ) ); + t.setFlag( T_3, true ); BOOST_CHECK( t.testFlag( T_3 ) ); +-} +\ No newline at end of file ++} +-- +1.8.1.5 + diff --git a/dev-libs/libzypp/libzypp-13.3.0.ebuild b/dev-libs/libzypp/libzypp-13.3.0.ebuild new file mode 100644 index 000000000000..883c1297d971 --- /dev/null +++ b/dev-libs/libzypp/libzypp-13.3.0.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzypp/libzypp-13.3.0.ebuild,v 1.1 2013/07/24 21:13:49 scarabeus Exp $ + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="ZYpp Package Management library" +HOMEPAGE="http://doc.opensuse.org/projects/libzypp/HEAD/" +# version bumps check here: +# https://build.opensuse.org/package/show/openSUSE:Factory/libzypp +SRC_URI="http://github.com/openSUSE/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="doc libproxy" + +RDEPEND=" + app-arch/rpm + dev-libs/boost + dev-libs/expat + dev-libs/libxml2 + dev-libs/openssl:0 + net-misc/curl + sys-libs/zlib + virtual/udev + libproxy? ( net-libs/libproxy ) +" +DEPEND="${DEPEND} + sys-devel/gettext + doc? ( app-doc/doxygen[dot] ) +" + +# tests require actual instance of zypp to be on system +RESTRICT="test" + +src_prepare() { + epatch \ + "${FILESDIR}/${PN}-fix-compilation.patch" \ + "${FILESDIR}/${PN}-fix-tests.patch" +} + +src_configure() { + local mycmakeargs=( + "-DUSE_TRANSLATION_SET=zypp" + $(cmake-utils_use_disable doc AUTODOCS) + $(cmake-utils-use_disable libproxy LIBPROXY) + ) + + cmake-utils_src_configure +} + +src_test() { + BUILD_DIR="${CMAKE_BUILD_DIR}/tests/" cmake-utils_src_compile + cmake-utils_src_test +} diff --git a/dev-libs/libzypp/metadata.xml b/dev-libs/libzypp/metadata.xml new file mode 100644 index 000000000000..b9854a857db0 --- /dev/null +++ b/dev-libs/libzypp/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>suse</herd> +<use> + <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag> +</use> +</pkgmetadata> + |