From 569d0da9beb879558b4ec2bd069bbd33163f453a Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Sun, 26 Feb 2012 19:56:32 +0000 Subject: Bump to 1.3.3, fix metadata. Thanks to slepnoga Package-Manager: portage-2.1.10.49/cvs/Linux x86_64 --- app-misc/hivex/ChangeLog | 13 ++- app-misc/hivex/Manifest | 9 +- ...0001-Fixed-gnulib-integration-for-hivexml.patch | 70 ++++++++++++++ app-misc/hivex/files/1.3.3/0002-automake.patch | 67 +++++++++++++ .../1.3.3/0003_autoconf_fix_automagic-1.3.3.patch | 105 +++++++++++++++++++++ app-misc/hivex/hivex-1.3.3.ebuild | 80 ++++++++++++++++ app-misc/hivex/metadata.xml | 2 +- 7 files changed, 341 insertions(+), 5 deletions(-) create mode 100644 app-misc/hivex/files/1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch create mode 100644 app-misc/hivex/files/1.3.3/0002-automake.patch create mode 100644 app-misc/hivex/files/1.3.3/0003_autoconf_fix_automagic-1.3.3.patch create mode 100644 app-misc/hivex/hivex-1.3.3.ebuild (limited to 'app-misc') diff --git a/app-misc/hivex/ChangeLog b/app-misc/hivex/ChangeLog index eca2989b292b..c1260b2a0c47 100644 --- a/app-misc/hivex/ChangeLog +++ b/app-misc/hivex/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-misc/hivex -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/ChangeLog,v 1.11 2011/12/01 17:26:53 maksbotan Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/ChangeLog,v 1.12 2012/02/26 19:56:32 maksbotan Exp $ + +*hivex-1.3.3 (26 Feb 2012) + + 26 Feb 2012; Maxim Koltsov + +files/1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch, + +files/1.3.3/0002-automake.patch, + +files/1.3.3/0003_autoconf_fix_automagic-1.3.3.patch, +hivex-1.3.3.ebuild, + metadata.xml: + Bump to 1.3.3, fix metadata. Thanks to slepnoga *hivex-1.3.2-r1 (01 Dec 2011) diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest index 5b179a477fcb..8e3233e622cc 100644 --- a/app-misc/hivex/Manifest +++ b/app-misc/hivex/Manifest @@ -1,10 +1,15 @@ +AUX 1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch 1948 RMD160 77c0bdf96bbbe6aacd8bcf380c9abcb40c796df5 SHA1 6e9212a51ad041fedf47eab221d9d781611f562a SHA256 e2f72baf94dee3439179250108e2ae05cf7e7b3d1c94f7e2481ae0d9bd6c2328 +AUX 1.3.3/0002-automake.patch 2095 RMD160 2531edf47fa7a4e20512c30c7fd1c3e1f37f9daf SHA1 4eedd0a1e4317a7aa964da3fbf021a9b0fbfae0c SHA256 89d52f2c0a5ade1e00b6bea33e38004bf3a24fc721ff90c5d930aa24b2f81c82 +AUX 1.3.3/0003_autoconf_fix_automagic-1.3.3.patch 3274 RMD160 4bc135dff127fc00054735658c4e48c10344aaa4 SHA1 2c6390f94d2f1f913246c1c3d8984bc20fec409d SHA256 1562f50ee11b75756ae3c6854b7746085b46904a29581c04ea73a318b10129e4 AUX autoconf_fix-1.3.1.patch 3561 RMD160 05d90b32f940649dc0bb0d959f70604e1cc84bdc SHA1 bb221c20105751f031ff1d2a2555de2ef88db730 SHA256 318b92cbecf6858a57188b7c4d1c2d18ba0daea84335825286bb4860c32ffe26 AUX autoconf_fix-1.3.2.patch 3561 RMD160 05d90b32f940649dc0bb0d959f70604e1cc84bdc SHA1 bb221c20105751f031ff1d2a2555de2ef88db730 SHA256 318b92cbecf6858a57188b7c4d1c2d18ba0daea84335825286bb4860c32ffe26 AUX python-test-fix-1.3.2.patch 281 RMD160 5a87dc1bbda092acb5cbe5df220cb71597a421fe SHA1 56a08eb4f2cf5e09e857b398265dcd34cca58502 SHA256 9bed6a09223f6429966b9c49ffa1fa597127190fec79aee99dd514734d3cc53b DIST hivex-1.3.1.tar.gz 1078397 RMD160 5f42e555fae7c694421714b7e7e9909888b5b2f3 SHA1 71b54636b516f7c08767c826c2c630358f9e52de SHA256 dc18d94c88f088b9423ed429fe2fd95bab51fc66f86b6081a7c73e4093913328 DIST hivex-1.3.2.tar.gz 1082330 RMD160 4c762ee80b5347497559af0c78d7f3962487ca2d SHA1 cdd53de1f6f17a98333b0bde8193458d409fe861 SHA256 e02d664b262f616e842d58a3787315ceb239c5986ff0652b37af9aeed483025c +DIST hivex-1.3.3.tar.gz 1135870 RMD160 16b0cd574435164628ad69facdadf4fe0553f073 SHA1 4565d6e3d94c5ad558f403ab2aa0ad19e7ccf738 SHA256 c6342ad9f3cd55fa4eb2f5d3acbeeb9701c94f0ad31eb9809639f8f6fc2c1676 EBUILD hivex-1.3.1.ebuild 1563 RMD160 3223dad9d06820cc293092e63b4342bb18225360 SHA1 8fd26711441a63047bdbd20a3e2e8ab9faecb8b1 SHA256 c6c0e8e3e611246fc5b7dbeee1ac95042fd087faf9eace150a9afd6d5bfdc762 EBUILD hivex-1.3.2-r1.ebuild 1663 RMD160 dc2859b669ada581597541efc002275fcbffc39a SHA1 7882a0822a1894da201fe43a318522843c59e966 SHA256 738dce83615f00fc659c9eaf8c6a19246b14fbf1079b5018d91961e472bb9d42 EBUILD hivex-1.3.2.ebuild 1638 RMD160 e4af5618c5846ed6c17cd9e84352d6fac7f3b6eb SHA1 d714f60236f8b292fab1aa9fe2bb516c9b42e8e2 SHA256 6a39624af7390b633b01d7e6702e4bbdec7c448c4aada755ed2c507f8c3e743a -MISC ChangeLog 2202 RMD160 4d39086efef222215bb0c8f70181924157378c3f SHA1 d199c27f45d62b4df9cdd3e0955e239721b41f68 SHA256 290e5d25da50025c385b12616c9b0a2d65cfc3313abc5e170dd4f23fac5e48d0 -MISC metadata.xml 327 RMD160 4d929f82166d31d5710f17e78f8c66f8fecef407 SHA1 cde31cdfff5ff2543719f2d83cf074261e06910a SHA256 ad8f529f9a202f44af4371b094874e9cd0857e8325396676a189b91e5dd544fc +EBUILD hivex-1.3.3.ebuild 1628 RMD160 2491f31a2520aa9d908e427ae9b75bc2050f89ff SHA1 3ad3787e5912a25497a94d707c9a75c7f64c967f SHA256 6121c929047bd1a81f840b3ea9dcd0090cdcda01b4feec7451c402f71cd5b090 +MISC ChangeLog 2526 RMD160 83eff83e54473eec9e8fd5c5cc47375724c0299b SHA1 4a3811a5491917658cd27f6d77ddc66f39802b6d SHA256 84609f53ad00b1b6ce04d2d85d73fd264c85b74b38343c8a4ad2fca0d4f46d50 +MISC metadata.xml 335 RMD160 2ce03edff95edf2c05cd80eb8ecce5217b211b77 SHA1 2c474acb945fb3b2dd4853d77be6d8fd6f44aa9b SHA256 6599c2005a7f1100436d99d61ae8fee6378a437bda0dad6ab2a322cb6129b51b diff --git a/app-misc/hivex/files/1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch b/app-misc/hivex/files/1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch new file mode 100644 index 000000000000..553f7a7ad87e --- /dev/null +++ b/app-misc/hivex/files/1.3.3/0001-Fixed-gnulib-integration-for-hivexml.patch @@ -0,0 +1,70 @@ +From: Hilko Bengen +Date: Thu, 1 Dec 2011 22:07:26 +0100 +Subject: Fixed gnulib integration for hivexml + +--- + lib/Makefile.am | 5 ++++- + sh/Makefile.am | 1 + + xml/Makefile.am | 3 ++- + xml/hivexml.c | 2 ++ + 4 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index cfd2e05..a339a00 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -39,7 +39,10 @@ libhivex_la_LDFLAGS = \ + $(LTLIBINTL) \ + $(LTLIBTHREAD) + libhivex_la_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) +-libhivex_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(srcdir) ++libhivex_la_CPPFLAGS = \ ++ -I$(top_srcdir)/gnulib/lib \ ++ -I$(top_builddir)/gnulib/lib \ ++ -I$(srcdir) + + include_HEADERS = hivex.h + +diff --git a/sh/Makefile.am b/sh/Makefile.am +index 0898370..a6f5ae6 100644 +--- a/sh/Makefile.am ++++ b/sh/Makefile.am +@@ -38,6 +38,7 @@ hivexsh_SOURCES = \ + hivexsh_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBREADLINE) + hivexsh_CFLAGS = \ + -I$(top_srcdir)/gnulib/lib \ ++ -I$(top_builddir)/gnulib/lib \ + -I$(top_srcdir)/lib \ + -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) +diff --git a/xml/Makefile.am b/xml/Makefile.am +index b2af45d..67ba248 100644 +--- a/xml/Makefile.am ++++ b/xml/Makefile.am +@@ -23,10 +23,11 @@ bin_PROGRAMS = hivexml + hivexml_SOURCES = \ + hivexml.c + +-hivexml_LDADD = ../lib/libhivex.la $(LIBXML2_LIBS) ++hivexml_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBXML2_LIBS) + hivexml_CFLAGS = \ + -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ + -I$(top_srcdir)/gnulib/lib \ ++ -I$(top_builddir)/gnulib/lib \ + -I$(top_srcdir)/lib \ + $(LIBXML2_CFLAGS) \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) +diff --git a/xml/hivexml.c b/xml/hivexml.c +index 5030c24..d38e9d4 100644 +--- a/xml/hivexml.c ++++ b/xml/hivexml.c +@@ -32,6 +32,8 @@ + #include + #endif + ++#include ++ + #include + + #include "hivex.h" +-- diff --git a/app-misc/hivex/files/1.3.3/0002-automake.patch b/app-misc/hivex/files/1.3.3/0002-automake.patch new file mode 100644 index 000000000000..8af8117c7f64 --- /dev/null +++ b/app-misc/hivex/files/1.3.3/0002-automake.patch @@ -0,0 +1,67 @@ +From: Hilko Bengen +Date: Thu, 1 Dec 2011 22:08:07 +0100 +Subject: automake + +--- + lib/Makefile.in | 6 +++++- + sh/Makefile.in | 1 + + xml/Makefile.in | 6 ++++-- + 3 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/lib/Makefile.in b/lib/Makefile.in +index 65734dd..5cf7bde 100644 +--- a/lib/Makefile.in ++++ b/lib/Makefile.in +@@ -1045,7 +1045,11 @@ libhivex_la_LDFLAGS = \ + $(LTLIBTHREAD) + + libhivex_la_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) +-libhivex_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(srcdir) ++libhivex_la_CPPFLAGS = \ ++ -I$(top_srcdir)/gnulib/lib \ ++ -I$(top_builddir)/gnulib/lib \ ++ -I$(srcdir) ++ + include_HEADERS = hivex.h + man_MANS = hivex.3 + noinst_DATA = \ +diff --git a/sh/Makefile.in b/sh/Makefile.in +index 109c8e8..0308a32 100644 +--- a/sh/Makefile.in ++++ b/sh/Makefile.in +@@ -995,6 +995,7 @@ hivexsh_SOURCES = \ + hivexsh_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBREADLINE) + hivexsh_CFLAGS = \ + -I$(top_srcdir)/gnulib/lib \ ++ -I$(top_builddir)/gnulib/lib \ + -I$(top_srcdir)/lib \ + -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) +diff --git a/xml/Makefile.in b/xml/Makefile.in +index ed4cd72..5cb647f 100644 +--- a/xml/Makefile.in ++++ b/xml/Makefile.in +@@ -119,7 +119,8 @@ PROGRAMS = $(bin_PROGRAMS) + am_hivexml_OBJECTS = hivexml-hivexml.$(OBJEXT) + hivexml_OBJECTS = $(am_hivexml_OBJECTS) + am__DEPENDENCIES_1 = +-hivexml_DEPENDENCIES = ../lib/libhivex.la $(am__DEPENDENCIES_1) ++hivexml_DEPENDENCIES = ../lib/libhivex.la ../gnulib/lib/libgnu.la \ ++ $(am__DEPENDENCIES_1) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent +@@ -976,10 +977,11 @@ EXTRA_DIST = \ + hivexml_SOURCES = \ + hivexml.c + +-hivexml_LDADD = ../lib/libhivex.la $(LIBXML2_LIBS) ++hivexml_LDADD = ../lib/libhivex.la ../gnulib/lib/libgnu.la $(LIBXML2_LIBS) + hivexml_CFLAGS = \ + -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ + -I$(top_srcdir)/gnulib/lib \ ++ -I$(top_builddir)/gnulib/lib \ + -I$(top_srcdir)/lib \ + $(LIBXML2_CFLAGS) \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) +-- diff --git a/app-misc/hivex/files/1.3.3/0003_autoconf_fix_automagic-1.3.3.patch b/app-misc/hivex/files/1.3.3/0003_autoconf_fix_automagic-1.3.3.patch new file mode 100644 index 000000000000..e49d2d390e0c --- /dev/null +++ b/app-misc/hivex/files/1.3.3/0003_autoconf_fix_automagic-1.3.3.patch @@ -0,0 +1,105 @@ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -183,11 +183,19 @@ + AC_CHECK_FUNC([open_memstream]) + AM_CONDITIONAL([HAVE_HIVEXSH],[test "x$ac_cv_func_open_memstream" = "xyes"]) + ++ + dnl Check for OCaml (optional, for OCaml bindings). ++AC_ARG_ENABLE([ocaml], ++ AS_HELP_STRING([--with-ocaml],[build Ocaml binding])) ++ ++ ++ ++ + AC_PROG_OCAML + AC_PROG_FINDLIB + AM_CONDITIONAL([HAVE_OCAML], +- [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"]) ++ [test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno" -a "x$enable_ocaml" = "xyes"]) ++ + AM_CONDITIONAL([HAVE_OCAMLOPT], + [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"]) + +@@ -227,21 +235,32 @@ + dnl Check for Perl modules that must be present to compile and + dnl test the Perl bindings. + missing_perl_modules=no +-for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do +- AC_MSG_CHECKING([for $pm]) +- if ! perl -M$pm -e1 >/dev/null 2>&1; then +- AC_MSG_RESULT([no]) +- missing_perl_modules=yes +- else +- AC_MSG_RESULT([yes]) +- fi +-done +-if test "x$missing_perl_modules" = "xyes"; then +- AC_MSG_WARN([some Perl modules required to compile or test the Perl bindings are missing]) +-fi ++AC_ARG_ENABLE([perl], ++ AS_HELP_STRING([--with-perl],[build Perl binding])) ++ ++ ++PERL= ++AS_IF([test "x$enable_perl" != "xno" ],[ ++ AC_CHECK_PROG([PERL],[perl],[yes],[no]) ++ ++ for pm in Test::More ExtUtils::MakeMaker IO::Stringy; do ++ AC_MSG_CHECKING([for $pm]) ++ if ! perl -M$pm -e1 >/dev/null 2>&1; then ++ AC_MSG_RESULT([no]) ++ missing_perl_modules=yes ++ else ++ AC_MSG_RESULT([yes]) ++ fi ++ done ++ ++ AS_IF([test "x$missing_perl_modules" = "xyes"], ++ [AC_MSG_FAILURE([some Perl modules required to compile or test the Perl bindings are missing])], ++ ) ++]) + + AM_CONDITIONAL([HAVE_PERL], +- [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"]) ++ [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes" -a "x$enable_perl" = "xyes"]) ++ + + dnl Check for Python (optional, for Python bindings). + PYTHON_PREFIX= +@@ -251,6 +270,7 @@ + + AC_CHECK_PROG([PYTHON],[python],[python],[no]) + ++ + if test "x$PYTHON" != "xno"; then + AC_MSG_CHECKING([Python prefix]) + PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"` +@@ -308,15 +328,24 @@ + AC_SUBST(PYTHON_INCLUDEDIR) + AC_SUBST(PYTHON_INSTALLDIR) + ++AC_ARG_ENABLE([python], ++ AS_HELP_STRING([--with-python],[build Python binding])) ++ + AM_CONDITIONAL([HAVE_PYTHON], +- [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"]) ++ [test "x$PYTHON_INCLUDEDIR" != "x" -a "x$PYTHON_SITE_PACKAGES" != "x" -a "x$enable_python" = "xyes"]) ++ ++ + + dnl Check for Ruby and rake (optional, for Ruby bindings). ++AC_ARG_ENABLE([ruby], ++ AS_HELP_STRING([--with-ruby],[build Ruby binding])) ++ + AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0]) + AC_CHECK_PROG([RAKE],[rake],[rake],[no]) + + AM_CONDITIONAL([HAVE_RUBY], +- [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"]) ++ [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY" -a "x$enable_ruby" = "xyes"]) ++ + + dnl dnl Check for Java. + dnl AC_ARG_WITH(java_home, diff --git a/app-misc/hivex/hivex-1.3.3.ebuild b/app-misc/hivex/hivex-1.3.3.ebuild new file mode 100644 index 000000000000..be7e4b5a2c39 --- /dev/null +++ b/app-misc/hivex/hivex-1.3.3.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.3.ebuild,v 1.1 2012/02/26 19:56:32 maksbotan Exp $ + +EAPI=4 + +WANT_AUTOMAKE="1.11" +AUTOTOOLS_IN_SOURCE_BUILD=1 + +PYTHON_DEPEND="python? 2:2.6" +inherit base autotools-utils perl-app python + +DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files" +HOMEPAGE="http://libguestfs.org" +SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ocaml readline perl python test static-libs ruby" + +RDEPEND="virtual/libiconv + virtual/libintl + dev-libs/libxml2:2 + ocaml? ( dev-lang/ocaml[ocamlopt] + dev-ml/findlib[ocamlopt] + ) + readline? ( sys-libs/readline ) + perl? ( dev-perl/IO-stringy ) + " + +DEPEND="${RDEPEND} + dev-lang/perl + perl? ( + test? ( dev-perl/Pod-Coverage + dev-perl/Test-Pod-Coverage ) ) + ruby? ( dev-ruby/rake ) + " +PATCHES=("${FILESDIR}"/"${PV}") +DOCS=(README) + +pkg_setup() { + if use python; then + python_set_active_version 2 + python_pkg_setup + python_need_rebuild + fi +} + +src_prepare() { + EPATCH_SUFFIX=patch EPATCH_FORCE=yes base_src_prepare + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_with readline) + $(use_enable ocaml) + $(use_enable perl) + --enable-nls + $(use_enable python) + $(use_enable ruby) + --disable-rpath ) + + autotools-utils_src_configure +} + +src_test() { + autotools-utils_src_compile check +} + +src_install() { + strip-linguas -i po + + autotools-utils_src_install "LINGUAS=""${LINGUAS}""" + + if use perl; then + fixlocalpod + fi +} diff --git a/app-misc/hivex/metadata.xml b/app-misc/hivex/metadata.xml index c0e52e1baa3d..3c86df53987d 100644 --- a/app-misc/hivex/metadata.xml +++ b/app-misc/hivex/metadata.xml @@ -3,7 +3,7 @@ proxy-maintainers - spamslepnoga@inbox.ru + andreis.vinogradovs@gmail.com maksbotan@gentoo.org -- cgit v1.2.3-65-gdbad