From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- dev-java/snappy/Manifest | 2 + dev-java/snappy/files/1.0.3_rc3-gentoo.patch | 14 ++ .../snappy/files/1.0.3_rc3-unbundle-snappy.patch | 52 ++++++ dev-java/snappy/files/1.1.0.1-gentoo.patch | 14 ++ .../snappy/files/1.1.0.1-unbundle-snappy.patch | 51 ++++++ dev-java/snappy/files/1.x-build.xml | 185 +++++++++++++++++++++ dev-java/snappy/metadata.xml | 9 + dev-java/snappy/snappy-1.0.3_rc3.ebuild | 66 ++++++++ dev-java/snappy/snappy-1.1.0.1.ebuild | 66 ++++++++ 9 files changed, 459 insertions(+) create mode 100644 dev-java/snappy/Manifest create mode 100644 dev-java/snappy/files/1.0.3_rc3-gentoo.patch create mode 100644 dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch create mode 100644 dev-java/snappy/files/1.1.0.1-gentoo.patch create mode 100644 dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch create mode 100644 dev-java/snappy/files/1.x-build.xml create mode 100644 dev-java/snappy/metadata.xml create mode 100644 dev-java/snappy/snappy-1.0.3_rc3.ebuild create mode 100644 dev-java/snappy/snappy-1.1.0.1.ebuild (limited to 'dev-java/snappy') diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest new file mode 100644 index 000000000000..d5472f33cd08 --- /dev/null +++ b/dev-java/snappy/Manifest @@ -0,0 +1,2 @@ +DIST snappy-java-1.0.3_rc3.tar.gz 5466748 SHA256 43e977ea09bf22e65d8a2ac3ba51f0dd5b3fb6e750bb5330980cc71631ed1a22 SHA512 eae4551d929f951be204218926cdea773a337ad584bd6fe49083526430a4e1ea80b395a627ecebc861232d36d2ec9034f2ebccac885da13e93fb74846298ba64 WHIRLPOOL 48e166ed6a297122eeef883402cd74f6995d34b922af70464b390ac11a6e91fbb5497e4e07a932233f8e69f714f987340b79e985bca42e6bd11bab075672745d +DIST snappy-java-1.1.0.1.tar.gz 4909520 SHA256 b37636927766e649d811c6b6874360641e86a2839f23c60e460da9c3a5d74dbc SHA512 32d0afce880ecccd814f7738eb375a13bd533998c73d79908964061337730ad76fb4794f78fd1fcdc4a4562db57cbc4c6f912d9f3351b1d75b12ce3224ec387e WHIRLPOOL 5d088cf6ec11512745b0a2d7b454e1a4155794d0045c5dfa8e42c9d2a99e538208880f52a3a908f5ee95f97e7c9ea68f35b2a1950e4275d27b39654b8914cf11 diff --git a/dev-java/snappy/files/1.0.3_rc3-gentoo.patch b/dev-java/snappy/files/1.0.3_rc3-gentoo.patch new file mode 100644 index 000000000000..58a17b0dbd04 --- /dev/null +++ b/dev-java/snappy/files/1.0.3_rc3-gentoo.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index a9d5cdc..8026741 100644 +--- a/Makefile ++++ b/Makefile +@@ -44,8 +44,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/ + + + $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) +- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy +- $(STRIP) $@ ++ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy $(LDFLAGS) + + clean-native: + rm -rf $(SNAPPY_OUT) diff --git a/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch b/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch new file mode 100644 index 000000000000..4885e7b5df80 --- /dev/null +++ b/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch @@ -0,0 +1,52 @@ +diff --git a/Makefile b/Makefile +index b67855a..a9d5cdc 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,7 +7,8 @@ all: snappy + + SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch) + SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz +-SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc ++#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc ++SNAPPY_CC:= + SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION) + SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC)) + SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o) +@@ -30,7 +31,8 @@ jni-header: $(SRC)/org/xerial/snappy/SnappyNative.h + $(SRC)/org/xerial/snappy/SnappyNative.h: $(SRC)/org/xerial/snappy/SnappyNative.java + $(JAVAH) -classpath $(TARGET)/classes -o $@ org.xerial.snappy.SnappyNative + +-$(SNAPPY_SRC): $(SNAPPY_UNPACKED) ++$(SNAPPY_SRC): ++# $(SNAPPY_UNPACKED) + + $(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc + @mkdir -p $(@D) +@@ -42,7 +44,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/ + + + $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) +- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) ++ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy + $(STRIP) $@ + + clean-native: +@@ -57,15 +59,15 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME) + + snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; }') + +-native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) +-snappy: $(TARGET)/$(snappy-jar-version).jar ++native: $(NATIVE_DLL) ++snappy: native + + $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) + @mkdir -p $(@D) + cp $< $@ + @mkdir -p $(NATIVE_TARGET_DIR) + cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME) +- ++ cp $< $(TARGET) + + $(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL) + $(MVN) package -Dmaven.test.skip=true diff --git a/dev-java/snappy/files/1.1.0.1-gentoo.patch b/dev-java/snappy/files/1.1.0.1-gentoo.patch new file mode 100644 index 000000000000..61403dd9167f --- /dev/null +++ b/dev-java/snappy/files/1.1.0.1-gentoo.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index 04f0435..0249d09 100644 +--- a/Makefile ++++ b/Makefile +@@ -60,8 +60,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/ + + + $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) +- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy +- $(STRIP) $@ ++ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy $(LDFLAGS) + + clean-native: + rm -rf $(SNAPPY_OUT) diff --git a/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch b/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch new file mode 100644 index 000000000000..17fb2e1583ed --- /dev/null +++ b/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch @@ -0,0 +1,51 @@ +diff --git a/Makefile b/Makefile +index 0821c87..04f0435 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,7 +7,8 @@ all: snappy + + SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch) + SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz +-SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc ++#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc ++SNAPPY_CC:= + SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION) + SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC)) + SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o) +@@ -46,7 +47,8 @@ src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode: src/main/resou + $(JAVAC) -source 1.5 -target 1.5 -d $(TARGET)/temp $< + cp $(TARGET)/temp/org/xerial/snappy/SnappyNativeLoader.class $@ + +-$(SNAPPY_SRC): $(SNAPPY_UNPACKED) ++$(SNAPPY_SRC): ++# $(SNAPPY_UNPACKED) + + $(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc + @mkdir -p $(@D) +@@ -58,7 +60,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/ + + + $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) +- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) ++ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy + $(STRIP) $@ + + clean-native: +@@ -73,14 +75,15 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME) + + snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; }') + +-native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) +-snappy: native $(TARGET)/$(snappy-jar-version).jar ++native: $(NATIVE_DLL) ++snappy: native + + $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) + @mkdir -p $(@D) + cp $< $@ + @mkdir -p $(NATIVE_TARGET_DIR) + cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME) ++ cp $< $(TARGET)/ + + + $(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL) diff --git a/dev-java/snappy/files/1.x-build.xml b/dev-java/snappy/files/1.x-build.xml new file mode 100644 index 000000000000..21d93bfcc1c6 --- /dev/null +++ b/dev-java/snappy/files/1.x-build.xml @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + =================================== WARNING =================================== + JUnit is not present in your $ANT_HOME/lib directory. Tests not executed. + =============================================================================== + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev-java/snappy/metadata.xml b/dev-java/snappy/metadata.xml new file mode 100644 index 000000000000..de75276c9b0a --- /dev/null +++ b/dev-java/snappy/metadata.xml @@ -0,0 +1,9 @@ + + + + java + + xerial/snappy-java + + + diff --git a/dev-java/snappy/snappy-1.0.3_rc3.ebuild b/dev-java/snappy/snappy-1.0.3_rc3.ebuild new file mode 100644 index 000000000000..e10ed9b57b4b --- /dev/null +++ b/dev-java/snappy/snappy-1.0.3_rc3.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-2 + +MY_PN="${PN}-java" +MY_PV="${PV/_rc/-rc}" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="Snappy compressor/decompressor for Java" +HOMEPAGE="https://github.com/xerial/snappy-java/" +SRC_URI="https://github.com/xerial/${MY_PN}/archive/${MY_P}.tar.gz -> ${PN}-java-${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="1.0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +CDEPEND="dev-java/osgi-core-api:0 + app-arch/snappy" + +DEPEND=">=virtual/jdk-1.6 + test? ( + dev-java/junit:4 + dev-java/xerial-core:0 + ) + ${CDEPEND}" + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +S="${WORKDIR}/${MY_PN}-${MY_P}" + +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_GENTOO_CLASSPATH="osgi-core-api" +EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,xerial-core" +EANT_TEST_ANT_TASKS="ant-junit" + +java_prepare() { + cp "${FILESDIR}"/1.x-build.xml "${S}"/build.xml || die + rm -r "${S}"/src/main/resources/org/xerial/snappy/native/ || die + epatch "${FILESDIR}"/${PV}-unbundle-snappy.patch + epatch "${FILESDIR}"/${PV}-gentoo.patch +} + +src_compile() { + emake + java-pkg-2_src_compile +} + +src_install() { + java-pkg_doso "${S}"/target/libsnappyjava.so + java-pkg_dojar "${S}/target/${PN}.jar" + + use source && java-pkg_dosrc "${S}"/src/main/java/* + use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs +} + +src_test() { + java-pkg-2_src_test +} diff --git a/dev-java/snappy/snappy-1.1.0.1.ebuild b/dev-java/snappy/snappy-1.1.0.1.ebuild new file mode 100644 index 000000000000..21c5a5f6be03 --- /dev/null +++ b/dev-java/snappy/snappy-1.1.0.1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-2 + +MY_PN="${PN}-java" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Snappy compressor/decompressor for Java" +HOMEPAGE="https://github.com/xerial/snappy-java/" +SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${PN}-java-${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="1.1" +KEYWORDS="~amd64 ~x86" +IUSE="" + +CDEPEND="dev-java/osgi-core-api:0 + app-arch/snappy" + +DEPEND=">=virtual/jdk-1.6 + test? ( + dev-java/junit:4 + dev-java/xerial-core:0 + dev-java/plexus-classworlds:0 + ) + ${CDEPEND}" + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +S="${WORKDIR}/${MY_P}" + +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_GENTOO_CLASSPATH="osgi-core-api" +EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,xerial-core,plexus-classworlds" +EANT_TEST_ANT_TASKS="ant-junit" + +java_prepare() { + cp "${FILESDIR}"/1.x-build.xml "${S}"/build.xml || die + rm -r "${S}"/src/main/resources/org/xerial/snappy/native/ || die + epatch "${FILESDIR}"/${PV}-unbundle-snappy.patch + epatch "${FILESDIR}"/${PV}-gentoo.patch +} + +src_compile() { + emake + java-pkg-2_src_compile +} + +src_install() { + java-pkg_doso "${S}"/target/libsnappyjava.so + java-pkg_dojar "${S}/target/${PN}.jar" + + use source && java-pkg_dosrc "${S}"/src/main/java/* + use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs +} + +src_test() { + java-pkg-2_src_test +} -- cgit v1.2.3-65-gdbad