diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-libs/yajl | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-libs/yajl')
-rw-r--r-- | dev-libs/yajl/Manifest | 3 | ||||
-rw-r--r-- | dev-libs/yajl/files/yajl-2.0.4-pkgconfig_multilib.patch | 40 | ||||
-rw-r--r-- | dev-libs/yajl/files/yajl-fix_static_linking.patch | 24 | ||||
-rw-r--r-- | dev-libs/yajl/files/yajl-fix_tests.patch | 15 | ||||
-rw-r--r-- | dev-libs/yajl/metadata.xml | 12 | ||||
-rw-r--r-- | dev-libs/yajl/yajl-1.0.11-r1.ebuild | 27 | ||||
-rw-r--r-- | dev-libs/yajl/yajl-1.0.11.ebuild | 30 | ||||
-rw-r--r-- | dev-libs/yajl/yajl-2.0.3.ebuild | 33 | ||||
-rw-r--r-- | dev-libs/yajl/yajl-2.0.4-r1.ebuild | 29 | ||||
-rw-r--r-- | dev-libs/yajl/yajl-2.0.4-r2.ebuild | 37 | ||||
-rw-r--r-- | dev-libs/yajl/yajl-2.0.4-r3.ebuild | 38 |
11 files changed, 288 insertions, 0 deletions
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest new file mode 100644 index 000000000000..d01e72c445d3 --- /dev/null +++ b/dev-libs/yajl/Manifest @@ -0,0 +1,3 @@ +DIST yajl-1.0.11.tar.gz 53705 SHA256 1e98e03b927a8ec466baea527647f5e243f56f71bdec48cdab1c875f0f8b96a9 SHA512 6ab0e5052da45be327f1987818037b89b37b382c095a9e64043422425759c4819e46eb6c43919677b6020d10c042d077655ad50809d13733f781bee7db8babf0 WHIRLPOOL 28cf0723b65cbdea8d177d4326322fe24d335fc9ff84482b363f797e622ca9f683b1d21c50e1cb8289ac4895906da833e6229a903431c04691c5fd50aa926f57 +DIST yajl-2.0.3.tar.gz 82544 SHA256 606ee384f288b6ad4f17c9c57b8868f8db525d542790fd1071139c9636e71952 SHA512 cef6e895ad169aac9e729f8bde006367d39456c6c1a62e1984d097f2f237cc5e317ddfef4d90c36242f772c867cee220082313f6d324a57e58a56d3e51ae0f85 WHIRLPOOL e9f3b37358d904f3e0aadad256fa7829b97170af5f9c3c3605c54f216cd1ac7958a281eb39f7e5cf5a0af2dce6120f900c3489ac50eeaef154b7ee4c50dd2d8b +DIST yajl-2.0.4.tar.gz 82814 SHA256 c19b9691cf15f22e74d903cd06ac9ba5e1e216e6a1b82bfe787c3b48a25bc118 SHA512 ab99fdd6b7e6f7add5530fff2d3ac6171ed3698267016d6cd23449742d36c9d848f065ba920dc2abb934488239e11e4ceda571c05fa472ab5d3f0480e9033a13 WHIRLPOOL ed821d07f5c06e4722d9de9648d4929fe6a5bcc13d2bd3bb6bcddce60a9817612d59f14963cc46b43b002345fc56813230194d997098de77f4d9075cf64dd85b diff --git a/dev-libs/yajl/files/yajl-2.0.4-pkgconfig_multilib.patch b/dev-libs/yajl/files/yajl-2.0.4-pkgconfig_multilib.patch new file mode 100644 index 000000000000..4a01848acd49 --- /dev/null +++ b/dev-libs/yajl/files/yajl-2.0.4-pkgconfig_multilib.patch @@ -0,0 +1,40 @@ +From 409098e97292aa1698ddff7f34dd8099db41a550 Mon Sep 17 00:00:00 2001 +From: ksergey <inndie@gmail.com> +Date: Tue, 28 Jan 2014 00:35:36 -0500 +Subject: [PATCH] fixed pkgconfig file path + +--- + src/CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e36b736..27b7c7d 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -30,7 +30,7 @@ ADD_DEFINITIONS(-DYAJL_BUILD) + # set up some paths + SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) + SET (incDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/include/yajl) +-SET (shareDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/share/pkgconfig) ++SET (pkgConfigDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib/pkgconfig) + + # set the output path for libraries + SET(LIBRARY_OUTPUT_PATH ${libDir}) +@@ -61,7 +61,7 @@ FILE(MAKE_DIRECTORY ${incDir}) + # generate build-time source + SET(dollar $) + CONFIGURE_FILE(api/yajl_version.h.cmake ${incDir}/yajl_version.h) +-CONFIGURE_FILE(yajl.pc.cmake ${shareDir}/yajl.pc) ++CONFIGURE_FILE(yajl.pc.cmake ${pkgConfigDir}/yajl.pc) + + # copy public headers to output directory + FOREACH (header ${PUB_HDRS}) +@@ -82,5 +82,5 @@ IF(NOT WIN32) + INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) + INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl) + INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl) +- INSTALL(FILES ${shareDir}/yajl.pc DESTINATION share/pkgconfig) ++ INSTALL(FILES ${pkgConfigDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) + ENDIF() +-- +1.8.5.5 diff --git a/dev-libs/yajl/files/yajl-fix_static_linking.patch b/dev-libs/yajl/files/yajl-fix_static_linking.patch new file mode 100644 index 000000000000..56bf0e737319 --- /dev/null +++ b/dev-libs/yajl/files/yajl-fix_static_linking.patch @@ -0,0 +1,24 @@ +diff -urN lloyd-yajl-f4baae0.old//reformatter/CMakeLists.txt lloyd-yajl-f4baae0//reformatter/CMakeLists.txt +--- lloyd-yajl-f4baae0.old//reformatter/CMakeLists.txt 2010-07-22 00:12:15.000000000 +0200 ++++ lloyd-yajl-f4baae0//reformatter/CMakeLists.txt 2011-02-11 19:28:40.006756997 +0100 +@@ -42,7 +42,7 @@ + + ADD_EXECUTABLE(json_reformat ${SRCS}) + +-TARGET_LINK_LIBRARIES(json_reformat yajl_s) ++TARGET_LINK_LIBRARIES(json_reformat yajl) + + # copy the binary into the output directory + GET_TARGET_PROPERTY(binPath json_reformat LOCATION) +diff -urN lloyd-yajl-f4baae0.old//verify/CMakeLists.txt lloyd-yajl-f4baae0//verify/CMakeLists.txt +--- lloyd-yajl-f4baae0.old//verify/CMakeLists.txt 2010-07-22 00:12:15.000000000 +0200 ++++ lloyd-yajl-f4baae0//verify/CMakeLists.txt 2011-02-11 19:28:58.296756998 +0100 +@@ -42,7 +42,7 @@ + + ADD_EXECUTABLE(json_verify ${SRCS}) + +-TARGET_LINK_LIBRARIES(json_verify yajl_s) ++TARGET_LINK_LIBRARIES(json_verify yajl) + + # copy in the binary + GET_TARGET_PROPERTY(binPath json_verify LOCATION) diff --git a/dev-libs/yajl/files/yajl-fix_tests.patch b/dev-libs/yajl/files/yajl-fix_tests.patch new file mode 100644 index 000000000000..b4a6498ced4c --- /dev/null +++ b/dev-libs/yajl/files/yajl-fix_tests.patch @@ -0,0 +1,15 @@ +diff -urN lloyd-yajl-9c15d72.old/test/run_tests.sh lloyd-yajl-9c15d72//test/run_tests.sh +--- lloyd-yajl-9c15d72.old/test/run_tests.sh 2010-04-04 23:59:51.000000000 +0200 ++++ lloyd-yajl-9c15d72//test/run_tests.sh 2010-04-05 00:00:26.000000000 +0200 +@@ -8,9 +8,9 @@ + # find test binary on both platforms. allow the caller to force a + # particular test binary (useful for non-cmake build systems). + if [ -z "$testBin" ]; then +- testBin="../build/test/Debug/yajl_test.exe" ++ testBin="./yajl_test.exe" + if [[ ! -x $testBin ]] ; then +- testBin="../build/test/yajl_test" ++ testBin="./yajl_test" + if [[ ! -x $testBin ]] ; then + echo "cannot execute test binary: '$testBin'" + exit 1; diff --git a/dev-libs/yajl/metadata.xml b/dev-libs/yajl/metadata.xml new file mode 100644 index 000000000000..429319866423 --- /dev/null +++ b/dev-libs/yajl/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>ruby</herd> + <maintainer> + <email>xmw@gentoo.org</email> + <name>Michael Weber</name> + </maintainer> + <upstream> + <remote-id type="github">lloyd/yajl</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-libs/yajl/yajl-1.0.11-r1.ebuild b/dev-libs/yajl/yajl-1.0.11-r1.ebuild new file mode 100644 index 000000000000..18c520cd462b --- /dev/null +++ b/dev-libs/yajl/yajl-1.0.11-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-multilib vcs-snapshot + +DESCRIPTION="Small event-driven (SAX-style) JSON parser" +HOMEPAGE="http://lloyd.github.com/yajl/" +SRC_URI="http://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" + +IUSE="" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-fix_tests.patch + + cmake-utils_src_prepare +} + +multilib_src_test() { + emake test +} diff --git a/dev-libs/yajl/yajl-1.0.11.ebuild b/dev-libs/yajl/yajl-1.0.11.ebuild new file mode 100644 index 000000000000..d1894efc3e61 --- /dev/null +++ b/dev-libs/yajl/yajl-1.0.11.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=2 + +inherit cmake-utils + +DESCRIPTION="Small event-driven (SAX-style) JSON parser" +HOMEPAGE="http://lloyd.github.com/yajl/" +SRC_URI="http://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm hppa ppc ppc64 x86" + +IUSE="" + +CMAKE_IN_SOURCE_BUILD="1" + +src_prepare() { + cd "${WORKDIR}"/lloyd-${PN}-* + S=$(pwd) + + epatch "${FILESDIR}"/${PN}-fix_tests.patch +} + +src_test() { + emake test +} diff --git a/dev-libs/yajl/yajl-2.0.3.ebuild b/dev-libs/yajl/yajl-2.0.3.ebuild new file mode 100644 index 000000000000..3921a6213b0b --- /dev/null +++ b/dev-libs/yajl/yajl-2.0.3.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 + +inherit base cmake-utils + +DESCRIPTION="Small event-driven (SAX-style) JSON parser" +HOMEPAGE="http://lloyd.github.com/yajl/" +SRC_URI="http://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +PATCHES=( + "${FILESDIR}"/${PN}-fix_static_linking.patch +) + +src_unpack() { + unpack ${A} + mv "${WORKDIR}"/lloyd-${PN}-* "${S}" +} + +src_test() { + emake -C "${CMAKE_BUILD_DIR}" test +} + +src_install() { + cmake-utils_src_install +} diff --git a/dev-libs/yajl/yajl-2.0.4-r1.ebuild b/dev-libs/yajl/yajl-2.0.4-r1.ebuild new file mode 100644 index 000000000000..4abe1e8429e1 --- /dev/null +++ b/dev-libs/yajl/yajl-2.0.4-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit base cmake-multilib + +DESCRIPTION="Small event-driven (SAX-style) JSON parser" +HOMEPAGE="http://lloyd.github.com/yajl/" +SRC_URI="http://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +PATCHES=( + "${FILESDIR}"/${PN}-fix_static_linking.patch +) + +src_unpack() { + unpack ${A} + mv "${WORKDIR}"/lloyd-${PN}-* "${S}" +} + +src_test() { + emake -C ${CMAKE_BUILD_DIR} test +} diff --git a/dev-libs/yajl/yajl-2.0.4-r2.ebuild b/dev-libs/yajl/yajl-2.0.4-r2.ebuild new file mode 100644 index 000000000000..05092a0f10cc --- /dev/null +++ b/dev-libs/yajl/yajl-2.0.4-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils cmake-multilib vcs-snapshot + +DESCRIPTION="Small event-driven (SAX-style) JSON parser" +HOMEPAGE="http://lloyd.github.com/yajl/" +SRC_URI="http://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-fix_static_linking.patch + + multilib_copy_sources +} + +src_test() { + run_test() { + cd "${BUILD_DIR}"/test + ./run_tests.sh ./yajl_test || die + } + multilib_parallel_foreach_abi run_test +} + +src_install() { + cmake-multilib_src_install + + use static-libs || \ + find "${D}" -name libyajl_s.a -delete +} diff --git a/dev-libs/yajl/yajl-2.0.4-r3.ebuild b/dev-libs/yajl/yajl-2.0.4-r3.ebuild new file mode 100644 index 000000000000..1bc8495b7b30 --- /dev/null +++ b/dev-libs/yajl/yajl-2.0.4-r3.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils cmake-multilib vcs-snapshot + +DESCRIPTION="Small event-driven (SAX-style) JSON parser" +HOMEPAGE="http://lloyd.github.com/yajl/" +SRC_URI="http://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-fix_static_linking.patch \ + "${FILESDIR}"/${P}-pkgconfig_multilib.patch + + multilib_copy_sources +} + +src_test() { + run_test() { + cd "${BUILD_DIR}"/test + ./run_tests.sh ./yajl_test || die + } + multilib_parallel_foreach_abi run_test +} + +src_install() { + cmake-multilib_src_install + + use static-libs || \ + find "${D}" -name libyajl_s.a -delete +} |