diff options
5 files changed, 191 insertions, 0 deletions
diff --git a/app-benchmarks/os-autoinst/ChangeLog b/app-benchmarks/os-autoinst/ChangeLog new file mode 100644 index 000000000000..9f6a9370c974 --- /dev/null +++ b/app-benchmarks/os-autoinst/ChangeLog @@ -0,0 +1,12 @@ +# ChangeLog for app-benchmarks/os-autoinst +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/os-autoinst/ChangeLog,v 1.1 2012/03/14 14:30:34 scarabeus Exp $ + +*os-autoinst-9999 (14 Mar 2012) + + 14 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> + +files/0001-use-proper-path-to-share-for-isotovideo.patch, + +files/0002-Use-libexecdir-and-do-not-depend-on-runtime-deps.patch, + +metadata.xml, +os-autoinst-9999.ebuild: + Add live ebuild for os-autoinst automatic distro checker. + diff --git a/app-benchmarks/os-autoinst/files/0001-use-proper-path-to-share-for-isotovideo.patch b/app-benchmarks/os-autoinst/files/0001-use-proper-path-to-share-for-isotovideo.patch new file mode 100644 index 000000000000..adc93cfd7b68 --- /dev/null +++ b/app-benchmarks/os-autoinst/files/0001-use-proper-path-to-share-for-isotovideo.patch @@ -0,0 +1,22 @@ +From 227971acbe41735d2f7f21fd9af94de561e43527 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.cz> +Date: Thu, 1 Mar 2012 11:58:06 +0100 +Subject: [PATCH 1/2] use proper path to share for isotovideo. + +--- + bin/isotovideo.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bin/isotovideo.in b/bin/isotovideo.in +index 715327d..b399564 100644 +--- a/bin/isotovideo.in ++++ b/bin/isotovideo.in +@@ -1,3 +1,3 @@ + #!/usr/bin/env sh +-exec_prefix="@prefix@" +-exec "@libdir@/@PACKAGE@/tools/isotovideo" ++prefix="@prefix@" ++exec "@datarootdir@/@PACKAGE@/tools/isotovideo" +-- +1.7.7 + diff --git a/app-benchmarks/os-autoinst/files/0002-Use-libexecdir-and-do-not-depend-on-runtime-deps.patch b/app-benchmarks/os-autoinst/files/0002-Use-libexecdir-and-do-not-depend-on-runtime-deps.patch new file mode 100644 index 000000000000..ef7020025dff --- /dev/null +++ b/app-benchmarks/os-autoinst/files/0002-Use-libexecdir-and-do-not-depend-on-runtime-deps.patch @@ -0,0 +1,109 @@ +From 06e7c7acfdc8f5c4d5fa56042d0a8c91214e10a1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.cz> +Date: Mon, 5 Mar 2012 15:36:00 +0100 +Subject: [PATCH 2/2] Use libexecdir and do not depend on runtime deps + +Now it matches exactly the spec file behaviour +--- + Makefile.am | 14 +++++++------- + bin/isotovideo.in | 4 ++-- + configure.ac | 21 --------------------- + 3 files changed, 9 insertions(+), 30 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 0f42c27..471f4b5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -13,7 +13,7 @@ packagestate_DATA_FOLDERS = \ + testimgs \ + audio + +-pkgdata_DATA = \ ++pkglibexec_DATA = \ + backend_qemu.pm \ + backend_vbox.pm \ + basenoupdate.pm \ +@@ -26,7 +26,7 @@ pkgdata_DATA = \ + ppm.pm \ + start.pl + +-pkdata_FOLDERS = \ ++pkglibexec_FOLDERS = \ + consoletest.d \ + distri \ + tools \ +@@ -40,7 +40,7 @@ pkdata_FOLDERS = \ + bin_SCRIPTS = bin/isotovideo + + EXTRA_DIST = autogen.sh bin/isotovideo.in \ +- $(doc_DATA) $(pkgdata_DATA) $(packagestate_DATA_FOLDERS) $(pkdata_FOLDERS) ++ $(doc_DATA) $(pkglibexec_DATA) $(packagestate_DATA_FOLDERS) $(pkglibexec_FOLDERS) + + CLEANFILES = $(bin_SCRIPTS) + +@@ -50,16 +50,16 @@ install-data-local: + cp -r $(top_srcdir)/$$i "$(DESTDIR)/$(packagestatedir)" ; \ + done + mkdir -p "$(DESTDIR)/$(pkgdatadir)" ; \ +- for i in $(pkdata_FOLDERS) ; do \ +- cp -r $(top_srcdir)/$$i "$(DESTDIR)/$(pkgdatadir)" ; \ ++ for i in $(pkglibexec_FOLDERS) ; do \ ++ cp -r $(top_srcdir)/$$i "$(DESTDIR)/$(pkglibexecdir)" ; \ + done + + uninstall-local: + for i in $(packagestate_DATA_FOLDERS) ; do \ + rm -rf "$(DESTDIR)/$(packagestatedir)/$$i" ; \ + done +- for i in $(pkdata_FOLDERS) ; do \ +- rm -rf "$(DESTDIR)/$(pkgdatadir)/$$i" ; \ ++ for i in $(pkglibexec_FOLDERS) ; do \ ++ rm -rf "$(DESTDIR)/$(pkglibexecdir)/$$i" ; \ + done + + dist-hook: +diff --git a/bin/isotovideo.in b/bin/isotovideo.in +index b399564..20bb945 100644 +--- a/bin/isotovideo.in ++++ b/bin/isotovideo.in +@@ -1,3 +1,3 @@ + #!/usr/bin/env sh +-prefix="@prefix@" +-exec "@datarootdir@/@PACKAGE@/tools/isotovideo" ++exec_prefix="@prefix@" ++exec "@libexecdir@/@PACKAGE@/tools/isotovideo" +diff --git a/configure.ac b/configure.ac +index 4998e89..24400f3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,27 +17,6 @@ AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([1.11 foreign dist-xz]) + AM_SILENT_RULES([yes]) + +-# =========================== +-# Find required base packages +-# =========================== +-PKG_PROG_PKG_CONFIG([0.24]) +- +-# ================== +-# Check dependencies +-# ================== +-AC_CHECK_PROG([KVM],[qemu-kvm],[yes]) +-AS_IF([test "x$KVM" != "xyes"], [ +- AC_MSG_ERROR([Please install qemu-kvm before installing.]) +-]) +-AC_CHECK_PROG([PERL],[perl],[yes]) +-AS_IF([test "x$PERL" != "xyes"], [ +- AC_MSG_ERROR([Please install perl before installing.]) +-]) +-# TODO: +-# Add checks for Time::HiRes and Algorithm::Line::Bresenham +- +-PKG_CHECK_MODULES([IMAGEMAGICK],[ImageMagick]) +- + AC_CONFIG_FILES([ + Makefile + bin/isotovideo +-- +1.7.7 + diff --git a/app-benchmarks/os-autoinst/metadata.xml b/app-benchmarks/os-autoinst/metadata.xml new file mode 100644 index 000000000000..22b329d8531c --- /dev/null +++ b/app-benchmarks/os-autoinst/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>benchmarks</herd> +<maintainer> + <email>scarabeus@gentoo.org</email> +</maintainer> +</pkgmetadata> diff --git a/app-benchmarks/os-autoinst/os-autoinst-9999.ebuild b/app-benchmarks/os-autoinst/os-autoinst-9999.ebuild new file mode 100644 index 000000000000..e1cfb761e9e1 --- /dev/null +++ b/app-benchmarks/os-autoinst/os-autoinst-9999.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/os-autoinst/os-autoinst-9999.ebuild,v 1.1 2012/03/14 14:30:34 scarabeus Exp $ + +EAPI=4 + +EGIT_REPO_URI="git://gitorious.org/os-autoinst/os-autoinst.git" + +inherit git-2 autotools + +DESCRIPTION="automated testing of Operating Systems" +HOMEPAGE="http://os-autoinst.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="" + +RDEPEND=" + app-emulation/qemu-kvm + app-text/gocr + media-gfx/imagemagick + media-video/ffmpeg2theora + +" +DEPEND="" + +src_prepare() { + epatch \ + "${FILESDIR}/0001-use-proper-path-to-share-for-isotovideo.patch" \ + "${FILESDIR}/0002-Use-libexecdir-and-do-not-depend-on-runtime-deps.patch" + + eautoreconf +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" +} |