Proper use dependencies. Desktop file fix.

(Portage version: 2.2_rc23/cvs/Linux i686)

4 files changed, 131 insertions, 2 deletions

diff --git a/app-backup/kdar/ChangeLog b/app-backup/kdar/ChangeLog
index 0b55168f874d..7b99dfa82166 100644
--- a/app-backup/kdar/ChangeLog
+++ b/app-backup/kdar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-backup/kdar
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/kdar/ChangeLog,v 1.15 2008/07/23 21:43:25 cardoe Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/kdar/ChangeLog,v 1.16 2009/02/22 15:01:50 carlo Exp $
+
+*kdar-2.1.0-r1 (22 Feb 2009)
+
+  22 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdar-2.1.0-as-needed.diff, +files/kdar-2.1.0-desktop-file.diff,
+  +kdar-2.1.0-r1.ebuild:
+  Proper use dependencies. Desktop file fix.
 
   23 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-backup/kdar/files/kdar-2.1.0-as-needed.diff b/app-backup/kdar/files/kdar-2.1.0-as-needed.diff
new file mode 100644
index 000000000000..d333a6806b1c
--- /dev/null
+++ b/app-backup/kdar/files/kdar-2.1.0-as-needed.diff
@@ -0,0 +1,49 @@
+diff -ur a/configure.in.in b/configure.in.in
+--- a/configure.in.in	2008-05-11 17:53:52.000000000 -0500
++++ b/configure.in.in	2009-02-13 19:30:38.000000000 -0600
+@@ -34,29 +34,28 @@
+ 	       [AC_HELP_STRING(--enable-mode=arg, [where arg is 32 or 64. Make kdar use 32 bit or 64 bit integers in place of infinint (default=infinint)])],
+ 	       [build_mode=$enableval], [])
+ 
+-MEM_LDFLAGS=$LDFLAGS
+ if test "x$build_mode" = "x32"; then
+ AC_MSG_CHECKING([for libdar32])
+-LDFLAGS=-ldar32
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <dar/libdar.hpp>]],
++LIBS="-ldar32 $LIBS"
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <dar/libdar.hpp>]],
+ [[using namespace libdar;
+  U_I major, minor;
+-get_version(major, minor);]])], [LIBS="$LIBS -ldar32"
++get_version(major, minor);]])], [
+ AC_MSG_RESULT([yes])], [AC_MSG_ERROR([required library not found. Please install libdar32.])])
+ fi
+ if test "x$build_mode" = "x64"; then
+ AC_MSG_CHECKING([for libdar64])
+-LDFLAGS=-ldar64
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <dar/libdar.hpp>]],
++LIBS="-ldar64 $LIBS"
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <dar/libdar.hpp>]],
+ [[using namespace libdar;
+ U_I major, minor;
+-get_version(major, minor);]])], [LIBS="$LIBS -ldar64"
++get_version(major, minor);]])], [
+ AC_MSG_RESULT([yes])], [AC_MSG_ERROR([required library not found. Please install libdar64.])])
+ fi
+ if test "x$build_mode" = "x"; then
+ AC_MSG_CHECKING([for libdar])
+-LDFLAGS=-ldar
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <dar/libdar.hpp>]],
++LIBS="-ldar $LIBS"
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <dar/libdar.hpp>]],
+ [[using namespace libdar;
+ U_I major, minor;
+ get_version(major, minor);]])], [LIBS="$LIBS -ldar"
+@@ -64,7 +63,6 @@
+ AC_MSG_RESULT([yes])], [AC_MSG_ERROR([required library not found. Please install libdar.])])
+ fi
+ 
+-LDFLAGS=$MEM_LDFLAGS
+ if test "x$build_mode" = "x32"; then
+ CXXFLAGS="$MEM_CXXFLAGS -DLIBDAR_MODE=32"
+ fi
diff --git a/app-backup/kdar/files/kdar-2.1.0-desktop-file.diff b/app-backup/kdar/files/kdar-2.1.0-desktop-file.diff
new file mode 100644
index 000000000000..1b59507f7bb9
--- /dev/null
+++ b/app-backup/kdar/files/kdar-2.1.0-desktop-file.diff
@@ -0,0 +1,25 @@
+--- src/kdar.desktop.o	2009-02-17 00:36:09.000000000 +0100
++++ src/kdar.desktop	2009-02-17 00:36:19.000000000 +0100
+@@ -1,9 +1,8 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=KDar (Disk-based Archive Tool)
+ Exec=kdar
+ Icon=kdar
+ Type=Application
+-DocPath=kdar/index.html
++X-DocPath=kdar/index.html
+ Comment=A KDE frontend to DAR (Disk ARchive)
+-Terminal=0
++Terminal=false
+--- src/Makefile.am.o	2009-02-17 00:36:43.000000000 +0100
++++ src/Makefile.am	2009-02-17 00:36:58.000000000 +0100
+@@ -52,7 +52,7 @@
+ KDE_ICON = AUTO
+ 
+ # this is where the kdelnk file will go 
+-kdelnkdir   = $(kde_appsdir)/Utilities
++kdelnkdir   = $(xdg_appsdir)
+ kdelnk_DATA = kdar.desktop
+ 
+ # this is where the XML-GUI resource file goes
diff --git a/app-backup/kdar/kdar-2.1.0-r1.ebuild b/app-backup/kdar/kdar-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..729c53b1c788
--- /dev/null
+++ b/app-backup/kdar/kdar-2.1.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/kdar/kdar-2.1.0-r1.ebuild,v 1.1 2009/02/22 15:01:50 carlo Exp $
+
+EAPI="2"
+
+ARTS_REQUIRED="never"
+
+inherit kde flag-o-matic
+
+DESCRIPTION="KDE Disk Archiver."
+HOMEPAGE="http://kdar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://gentoo/kde-admindir-3.5.5.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="dar32 dar64"
+
+DEPEND=">=app-backup/dar-2.3.5[dar32?,dar64?]
+	>=app-arch/bzip2-1.0.2
+	>=sys-libs/zlib-1.1.4"
+RDEPEND="${DEPEND}"
+
+need-kde 3.5
+
+PATCHES=(
+	"${FILESDIR}/kdar-2.1.0-desktop-file.diff"
+	"${FILESDIR}/kdar-2.1.0-as-needed.diff"
+	)
+
+src_prepare() {
+	# empty, EAPI 2 eclass incompatibility.
+	:
+}
+
+src_compile() {
+	local myconf
+
+	# Bug 116112
+	replace-flags "-Os" "-O2"
+
+	use dar32 && myconf="${myconf} --enable-mode=32"
+	use dar64 && myconf="${myconf} --enable-mode=64"
+
+	kde_src_compile
+}