From 5699c679833ba7b4b6991412ed6daafc75126313 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 26 Oct 2012 06:30:14 +0200
Subject: [PATCH] oprofile: update to 0.9.8.

---
 srcpkgs/oprofile/oprofile-qt4-gui.template        |  2 +-
 .../patches/bfd-header-needs-sys-types.patch      | 10 ----------
 .../patches/opcontrol_hardcoded_path.patch        | 15 ---------------
 srcpkgs/oprofile/template                         | 15 ++++++++-------
 4 files changed, 9 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/oprofile/patches/bfd-header-needs-sys-types.patch
 delete mode 100644 srcpkgs/oprofile/patches/opcontrol_hardcoded_path.patch

diff --git a/srcpkgs/oprofile/oprofile-qt4-gui.template b/srcpkgs/oprofile/oprofile-qt4-gui.template
index 4780586d179..66b9981d993 100644
--- a/srcpkgs/oprofile/oprofile-qt4-gui.template
+++ b/srcpkgs/oprofile/oprofile-qt4-gui.template
@@ -1,6 +1,6 @@
 # Template file for 'oprofile-qt4-gui'.
 #
-depends="oprofile>=$version"
+depends="oprofile-${version}_${revision}"
 short_desc="Qt GUI for oprofile"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/oprofile/patches/bfd-header-needs-sys-types.patch b/srcpkgs/oprofile/patches/bfd-header-needs-sys-types.patch
deleted file mode 100644
index eac62d61ef5..00000000000
--- a/srcpkgs/oprofile/patches/bfd-header-needs-sys-types.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- opjitconv/opjitconv.h.orig	2012-06-12 14:40:00.546999021 +0200
-+++ opjitconv/opjitconv.h	2012-06-12 14:40:09.482781715 +0200
-@@ -26,6 +26,7 @@
- #define OP_JIT_CONV_ALREADY_DONE 5
- #define OP_JIT_CONV_TMPDIR_NOT_REMOVED 6
- 
-+#include <sys/types.h>
- #include <bfd.h>
- #include <stddef.h>
- #include <sys/stat.h>
diff --git a/srcpkgs/oprofile/patches/opcontrol_hardcoded_path.patch b/srcpkgs/oprofile/patches/opcontrol_hardcoded_path.patch
deleted file mode 100644
index 02eefa190db..00000000000
--- a/srcpkgs/oprofile/patches/opcontrol_hardcoded_path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Assume that which and dirname are found in PATH, don't harcode your custom PATH.
-
---- utils/opcontrol.orig	2011-12-16 16:32:00.405576367 +0100
-+++ utils/opcontrol	2011-12-16 16:32:25.755959905 +0100
-@@ -2156,8 +2156,8 @@ help_start_daemon_with_ibs()
- # determine the location of opcontrol and related programs
- if test -z "$OPDIR"; then
- 	BINDIR="/usr/bin"
--	OPCONTROL=`$BINDIR/which $0`
--	OPDIR=`$BINDIR/dirname $OPCONTROL`
-+	OPCONTROL=`which $0`
-+	OPDIR=`dirname $OPCONTROL`
- fi
- 
- PATH=$OPDIR:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin
diff --git a/srcpkgs/oprofile/template b/srcpkgs/oprofile/template
index d6ef6cd7522..7182970674f 100644
--- a/srcpkgs/oprofile/template
+++ b/srcpkgs/oprofile/template
@@ -1,12 +1,11 @@
 # Template file for 'oprofile'
 pkgname=oprofile
-version=0.9.7
-revision=3
-homepage="http://oprofile.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+version=0.9.8
+revision=1
 build_style=gnu-configure
-configure_args="--with-kernel-support --with-x --enable-gui=qt4 --disable-static"
-makedepends="popt-devel binutils-devel>=2.22.52.0.4_2 pkg-config libX11-devel icu-devel qt-devel"
+configure_args="--with-x --enable-gui=qt4 --disable-static"
+makedepends="popt-devel binutils-devel>=2.22.52.0.4_2 pkg-config
+ libX11-devel icu-devel qt-devel"
 subpackages="$pkgname-qt4-gui"
 system_accounts="oprofile"
 oprofile_homedir="/var/lib/oprofile"
@@ -14,7 +13,9 @@ make_dirs="/var/lib/oprofile 0750 oprofile oprofile"
 short_desc="Transparent low-overhead system-wide profiler for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
-checksum=cb5b507d5dea058d223fcad3cec8ff9638a4163106afd66d176798bbd973d527
+homepage="http://oprofile.sourceforge.net"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+checksum=ab45900fa1a23e5d5badf3c0a55f26c17efe6e184efcf00b371433751fa761bc
 long_desc="
  OProfile is a system-wide profiler for Linux systems, capable of profiling
  all running code at low overhead.