summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-util/open-vcdiff
downloadgentoo-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-util/open-vcdiff')
-rw-r--r--dev-util/open-vcdiff/Manifest2
-rw-r--r--dev-util/open-vcdiff/files/0.8.3-system-libs.patch215
-rw-r--r--dev-util/open-vcdiff/metadata.xml11
-rw-r--r--dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild39
-rw-r--r--dev-util/open-vcdiff/open-vcdiff-0.8.4.ebuild25
5 files changed, 292 insertions, 0 deletions
diff --git a/dev-util/open-vcdiff/Manifest b/dev-util/open-vcdiff/Manifest
new file mode 100644
index 00000000000..96a09e42cb7
--- /dev/null
+++ b/dev-util/open-vcdiff/Manifest
@@ -0,0 +1,2 @@
+DIST open-vcdiff-0.8.3.tar.gz 757271 SHA256 b7e47db78866082e9e8b5782f5491092c8414f0acc0440aea03b14c7d1d3c371 SHA512 7f0712aa9f08b19658fbc77f28e6dde9f4a45a4be8f97fb00db1ca78f5ee4e7b9f333dc3208e9ba85b5696a24fa30865397c096be1687d73048809cd30e12a55 WHIRLPOOL 90d75d62c7eceae74639c2105cae98bd148b02c7c83d169a71f094d8f30829ed736b8d8fb43ecef06657ce8b10b8dfaf0f98b439dd170a4a0259e9dd4f035977
+DIST open-vcdiff-0.8.4.tar.gz 780923 SHA256 2b142b1027fb0a62c41347600e01a53fa274dad15445a7da48083c830c3138b3 SHA512 fb9062d6a854c999d04eb68672596583e958c3d1705d58429280cb53dcf381c880b23d7fc9d5277545b4a5f9023435648d7bc87bad10cb30385fb950e5d499bd WHIRLPOOL fbbb26f6aa3773bb06c33085bc1d2f1e2bd74776466864713b06567806eca815f80d72d8872487359ffa99102f8914948d20b37a2b4e3bf502a03ca7de029a8a
diff --git a/dev-util/open-vcdiff/files/0.8.3-system-libs.patch b/dev-util/open-vcdiff/files/0.8.3-system-libs.patch
new file mode 100644
index 00000000000..508f30379b2
--- /dev/null
+++ b/dev-util/open-vcdiff/files/0.8.3-system-libs.patch
@@ -0,0 +1,215 @@
+Unbundle the following libraries:
+gflags
+gtest
+zlib
+
+Index: configure.ac
+===================================================================
+--- configure.ac (revision 42)
++++ configure.ac (working copy)
+@@ -111,7 +111,5 @@
+ fi
+ AC_SUBST(LIBSTDCXX_LA_LINKER_FLAG)
+
+-AC_CONFIG_FILES([Makefile
+- gflags/src/gflags/gflags.h
+- gflags/src/gflags/gflags_completions.h])
++AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+Index: Makefile.am
+===================================================================
+--- Makefile.am (revision 42)
++++ Makefile.am (working copy)
+@@ -5,11 +5,7 @@
+ -I gflags/m4
+
+ # This is so we can #include <google/vcencoder.h> or <gtest/gtest.h>
+-AM_CPPFLAGS = -I$(top_srcdir)/src \
+- -I$(top_srcdir)/src/zlib \
+- -I$(top_srcdir)/gflags/src \
+- -I$(top_srcdir)/gtest \
+- -I$(top_srcdir)/gtest/include
++AM_CPPFLAGS = -I$(top_srcdir)/src
+
+ # For a non-optimized (debug) build, change "-DNDEBUG" to "-DDEBUG".
+ AM_CXXFLAGS = -DNDEBUG -DNO_THREADS
+@@ -46,6 +42,7 @@
+ ## Tests are added one by one to these lists in the RULES sections.
+ check_PROGRAMS =
+ check_SCRIPTS =
++check_LTLIBRARIES =
+
+ ## Other binaries, scripts, and libraries that are built but not automatically
+ ## installed.
+@@ -55,52 +52,11 @@
+
+ ## vvvv RULES TO MAKE THE LIBRARIES, BINARIES, AND UNITTESTS
+
+-# google-gflags: Used for command-line client
+-# Please refer to http://code.google.com/p/google-gflags/ for details
+-noinst_LTLIBRARIES += libgflags.la
+-libgflags_la_SOURCES = gflags/src/gflags/gflags.h \
+- gflags/src/gflags/gflags_completions.h \
+- gflags/src/mutex.h \
+- gflags/src/gflags.cc \
+- gflags/src/gflags_completions.cc \
+- gflags/src/gflags_reporting.cc
+-
+-# gtest (Google Test): Used for unit tests only
+-# Please refer to http://code.google.com/p/googletest/ for details
+-noinst_LTLIBRARIES += libgtest_main.la
+-libgtest_main_la_SOURCES = gtest/include/gtest/gtest.h \
+- gtest/include/gtest/gtest-death-test.h \
+- gtest/include/gtest/gtest-message.h \
+- gtest/include/gtest/gtest-param-test.h \
+- gtest/include/gtest/gtest_pred_impl.h \
+- gtest/include/gtest/gtest_prod.h \
+- gtest/include/gtest/gtest-spi.h \
+- gtest/include/gtest/gtest-test-part.h \
+- gtest/include/gtest/gtest-typed-test.h \
+- gtest/include/gtest/internal/gtest-death-test-internal.h \
+- gtest/include/gtest/internal/gtest-filepath.h \
+- gtest/include/gtest/internal/gtest-internal.h \
+- gtest/include/gtest/internal/gtest-linked_ptr.h \
+- gtest/include/gtest/internal/gtest-param-util.h \
+- gtest/include/gtest/internal/gtest-param-util-generated.h \
+- gtest/include/gtest/internal/gtest-port.h \
+- gtest/include/gtest/internal/gtest-string.h \
+- gtest/include/gtest/internal/gtest-tuple.h \
+- gtest/include/gtest/internal/gtest-type-util.h \
+- gtest/src/gtest-internal-inl.h \
+- gtest/src/gtest.cc \
+- gtest/src/gtest-death-test.cc \
+- gtest/src/gtest-filepath.cc \
+- gtest/src/gtest-port.cc \
+- gtest/src/gtest-test-part.cc \
+- gtest/src/gtest-typed-test.cc \
+- gtest/src/gtest_main.cc \
+- src/testing.h
+-
+-noinst_LTLIBRARIES += libvcdecoder_test_common.la
++check_LTLIBRARIES += libvcdecoder_test_common.la
+ libvcdecoder_test_common_la_SOURCES = src/vcdecoder_test.h \
+ src/vcdecoder_test.cc
+-libvcdecoder_test_common_la_LIBADD = libvcddec.la libgtest_main.la
++libvcdecoder_test_common_la_LIBADD = libvcddec.la -lgtest_main
++libvcdecoder_test_common_la_LDFLAGS = -pthread
+
+ # libvcdcom: The open-vcdiff *common* library
+ lib_LTLIBRARIES += libvcdcom.la
+@@ -112,9 +68,6 @@
+ src/logging.h \
+ src/varint_bigendian.h \
+ src/vcdiff_defs.h \
+- src/zlib/zlib.h \
+- src/zlib/zconf.h \
+- src/zlib/adler32.c \
+ src/addrcache.cc \
+ src/codetable.cc \
+ src/logging.cc \
+@@ -128,7 +81,7 @@
+ src/decodetable.cc \
+ src/headerparser.cc \
+ src/vcdecoder.cc
+-libvcddec_la_LIBADD = libvcdcom.la
++libvcddec_la_LIBADD = libvcdcom.la -lz
+
+ # libvcdenc: The open-vcdiff *encoder* library
+ lib_LTLIBRARIES += libvcdenc.la
+@@ -147,52 +100,62 @@
+ src/jsonwriter.cc \
+ src/vcdiffengine.cc \
+ src/vcencoder.cc
+-libvcdenc_la_LIBADD = libvcdcom.la
++libvcdenc_la_LIBADD = libvcdcom.la -lz
+
+ bin_PROGRAMS += vcdiff
+ vcdiff_SOURCES = src/vcdiff_main.cc
+-vcdiff_LDADD = libvcddec.la libvcdenc.la libgflags.la
++vcdiff_LDADD = libvcddec.la libvcdenc.la -lgflags
+
+ check_PROGRAMS += addrcache_test
+ addrcache_test_SOURCES = src/addrcache_test.cc
+-addrcache_test_LDADD = libvcdcom.la libgtest_main.la
++addrcache_test_LDADD = libvcdcom.la -lgtest_main
++addrcache_test_LDFLAGS = -pthread
+
+ check_PROGRAMS += blockhash_test
+ blockhash_test_SOURCES = src/blockhash_test.cc
+-blockhash_test_LDADD = libvcdenc.la libgtest_main.la
++blockhash_test_LDADD = libvcdenc.la -lgtest_main
++blockhash_test_LDFLAGS = -pthread
+
+ check_PROGRAMS += codetable_test
+ codetable_test_SOURCES = src/codetable_test.cc
+-codetable_test_LDADD = libvcdcom.la libgtest_main.la
++codetable_test_LDADD = libvcdcom.la -lgtest_main
++codetable_test_LDFLAGS = -pthread
+
+ check_PROGRAMS += decodetable_test
+ decodetable_test_SOURCES = src/decodetable_test.cc
+-decodetable_test_LDADD = libvcddec.la libvcdcom.la libgtest_main.la
++decodetable_test_LDADD = libvcddec.la libvcdcom.la -lgtest_main
++decodetable_test_LDFLAGS = -pthread
+
+ check_PROGRAMS += encodetable_test
+ encodetable_test_SOURCES = src/encodetable_test.cc
+-encodetable_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la
++encodetable_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main
++encodetable_test_LDFLAGS = -pthread
+
+ check_PROGRAMS += headerparser_test
+ headerparser_test_SOURCES = src/headerparser_test.cc
+-headerparser_test_LDADD = libvcddec.la libvcdcom.la libgtest_main.la
++headerparser_test_LDADD = libvcddec.la libvcdcom.la -lgtest_main
++headerparser_test_LDFLAGS = -pthread
+
+ check_PROGRAMS += instruction_map_test
+ instruction_map_test_SOURCES = src/instruction_map_test.cc
+-instruction_map_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la
++instruction_map_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main
++instruction_map_test_LDFLAGS = -pthread
+
+ check_PROGRAMS += output_string_test
+ output_string_test_SOURCES = src/output_string_crope.h \
+ src/output_string_test.cc
+-output_string_test_LDADD = libgtest_main.la
++output_string_test_LDADD = -lgtest_main
++output_string_test_LDFLAGS = -pthread
+
+ check_PROGRAMS += rolling_hash_test
+ rolling_hash_test_SOURCES = src/rolling_hash_test.cc
+-rolling_hash_test_LDADD = libvcdcom.la libgtest_main.la
++rolling_hash_test_LDADD = libvcdcom.la -lgtest_main
++rolling_hash_test_LDFLAGS = -pthread
+
+ check_PROGRAMS += varint_bigendian_test
+ varint_bigendian_test_SOURCES = src/varint_bigendian_test.cc
+-varint_bigendian_test_LDADD = libvcdcom.la libgtest_main.la
++varint_bigendian_test_LDADD = libvcdcom.la -lgtest_main
++varint_bigendian_test_LDFLAGS = -pthread
+
+ check_PROGRAMS += vcdecoder1_test
+ vcdecoder1_test_SOURCES = src/vcdecoder1_test.cc
+@@ -216,15 +179,18 @@
+
+ check_PROGRAMS += vcdiffengine_test
+ vcdiffengine_test_SOURCES = src/vcdiffengine_test.cc
+-vcdiffengine_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la
++vcdiffengine_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main
++vcdiffengine_test_LDFLAGS = -pthread
+
+ check_PROGRAMS += vcencoder_test
+ vcencoder_test_SOURCES = src/vcencoder_test.cc
+-vcencoder_test_LDADD = libvcddec.la libvcdenc.la libvcdcom.la libgtest_main.la
++vcencoder_test_LDADD = libvcddec.la libvcdenc.la libvcdcom.la -lgtest_main
++vcencoder_test_LDFLAGS = -pthread
+
+ check_PROGRAMS += jsonwriter_test
+ jsonwriter_test_SOURCES = src/jsonwriter_test.cc
+-jsonwriter_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la
++jsonwriter_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main
++jsonwriter_test_LDFLAGS = -pthread
+
+ check_SCRIPTS += src/vcdiff_test.sh
+ dist_noinst_DATA = testdata/configure.ac.v0.1 \
diff --git a/dev-util/open-vcdiff/metadata.xml b/dev-util/open-vcdiff/metadata.xml
new file mode 100644
index 00000000000..af267846075
--- /dev/null
+++ b/dev-util/open-vcdiff/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>floppym@gentoo.org</email>
+ <name>Mike Gilbert</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="google-code">open-vcdiff</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild b/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild
new file mode 100644
index 00000000000..7a6d762fd2d
--- /dev/null
+++ b/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils
+
+DESCRIPTION="An encoder/decoder for the VCDIFF (RFC3284) format"
+HOMEPAGE="http://code.google.com/p/open-vcdiff/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-cpp/gflags
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )
+"
+
+src_prepare() {
+ rm -r gflags/src gtest src/zlib || die
+ local PATCHES=( "${FILESDIR}/0.8.3-system-libs.patch" )
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ --enable-shared
+ --disable-static
+ )
+ autotools-utils_src_configure
+}
diff --git a/dev-util/open-vcdiff/open-vcdiff-0.8.4.ebuild b/dev-util/open-vcdiff/open-vcdiff-0.8.4.ebuild
new file mode 100644
index 00000000000..bc2c31c9af4
--- /dev/null
+++ b/dev-util/open-vcdiff/open-vcdiff-0.8.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="An encoder/decoder for the VCDIFF (RFC3284) format"
+HOMEPAGE="http://code.google.com/p/open-vcdiff/"
+SRC_URI="http://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_configure() {
+ econf --disable-static
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ prune_libtool_files
+}