Version bump wrt #220016. Patching .desktop file to respect latest specification. Fixing icondir from /usr/share/icons to /usr/share/pixmaps.

(Portage version: 2.1.5_rc6)

5 files changed, 76 insertions, 58 deletions

diff --git a/media-gfx/rawstudio/ChangeLog b/media-gfx/rawstudio/ChangeLog
index b096610ffdbc..b8baac4ff67e 100644
--- a/media-gfx/rawstudio/ChangeLog
+++ b/media-gfx/rawstudio/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/rawstudio
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/ChangeLog,v 1.3 2008/02/04 15:08:49 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/ChangeLog,v 1.4 2008/05/03 08:48:45 drac Exp $
+
+*rawstudio-1.0 (03 May 2008)
+
+  03 May 2008; Samuli Suominen <drac@gentoo.org>
+  -files/rawstudio-0.6-desktop-entry.patch,
+  +files/rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch,
+  -rawstudio-0.6.ebuild, -rawstudio-0.7.ebuild, +rawstudio-1.0.ebuild:
+  Version bump wrt #220016. Patching .desktop file to respect latest
+  specification. Fixing icondir from /usr/share/icons to /usr/share/pixmaps.
 
 *rawstudio-0.7 (04 Feb 2008)
 
diff --git a/media-gfx/rawstudio/files/rawstudio-0.6-desktop-entry.patch b/media-gfx/rawstudio/files/rawstudio-0.6-desktop-entry.patch
deleted file mode 100644
index c9c0cef821d8..000000000000
--- a/media-gfx/rawstudio/files/rawstudio-0.6-desktop-entry.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur rawstudio-0.6.orig/rawstudio.desktop rawstudio-0.6/rawstudio.desktop
---- rawstudio-0.6.orig/rawstudio.desktop	2007-08-14 17:37:50.000000000 +0300
-+++ rawstudio-0.6/rawstudio.desktop	2008-01-21 21:02:06.000000000 +0200
-@@ -1,12 +1,12 @@
- [Desktop Entry]
- Version=1.0
- Type=Application
--Categories=Application;Graphics;Photography;GTK;
-+Categories=Graphics;Photography;GTK;
- Name=Rawstudio
- GenericName=Raw converter
- Comment=Open source raw-image converter and manipulation application
- Exec=rawstudio %F
- StartupNotify=true
--Icon=rawstudio.png
-+Icon=rawstudio
- MimeType=image/x-dcraw;
- 
diff --git a/media-gfx/rawstudio/files/rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch b/media-gfx/rawstudio/files/rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch
new file mode 100644
index 000000000000..d9d771ae0068
--- /dev/null
+++ b/media-gfx/rawstudio/files/rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch
@@ -0,0 +1,56 @@
+diff -ur rawstudio-1.0.orig/pixmaps/Makefile.in rawstudio-1.0/pixmaps/Makefile.in
+--- rawstudio-1.0.orig/pixmaps/Makefile.in	2008-04-19 02:30:28.000000000 +0300
++++ rawstudio-1.0/pixmaps/Makefile.in	2008-05-03 11:40:35.000000000 +0300
+@@ -162,7 +162,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-icondir = $(datadir)/icons
++icondir = $(datadir)/pixmaps
+ icon_DATA = rawstudio.png
+ rawstudiodir = $(datadir)/pixmaps/rawstudio
+ rawstudio_DATA = overlay_deleted.png \
+diff -ur rawstudio-1.0.orig/rawstudio.desktop rawstudio-1.0/rawstudio.desktop
+--- rawstudio-1.0.orig/rawstudio.desktop	2008-04-19 02:14:50.000000000 +0300
++++ rawstudio-1.0/rawstudio.desktop	2008-05-03 11:37:43.000000000 +0300
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Version=1.0
+ Type=Application
+-Categories=Application;Graphics;Photography;GTK;
++Categories=Graphics;Photography;GTK;
+ Name=Rawstudio
+ Name[it]=Rawstudio
+ Name[pl]=Rawstudio
+@@ -16,6 +16,6 @@
+ Comment[ru]=Свободная программа для проявки цифровых негативов
+ Exec=rawstudio %F
+ StartupNotify=true
+-Icon=rawstudio.png
++Icon=rawstudio
+ MimeType=image/x-dcraw;
+ 
+diff -ur rawstudio-1.0.orig/src/gtk-interface.c rawstudio-1.0/src/gtk-interface.c
+--- rawstudio-1.0.orig/src/gtk-interface.c	2008-04-19 02:51:40.000000000 +0300
++++ rawstudio-1.0/src/gtk-interface.c	2008-05-03 11:41:11.000000000 +0300
+@@ -985,7 +985,7 @@
+ 	GdkColor bgcolor = {0, 0, 0, 0 };
+ 	GString *window_title = g_string_new(_("Rawstudio"));
+ 	
+-	gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR "/icons/" PACKAGE ".png", NULL);
++	gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE ".png", NULL);
+ 	rs->window = gui_window_make(rs);
+ 	gtk_widget_show(rs->window);
+ 
+diff -ur rawstudio-1.0.orig/src/rawstudio.c rawstudio-1.0/src/rawstudio.c
+--- rawstudio-1.0.orig/src/rawstudio.c	2008-04-19 02:14:49.000000000 +0300
++++ rawstudio-1.0/src/rawstudio.c	2008-05-03 11:40:55.000000000 +0300
+@@ -929,7 +929,7 @@
+ check_install()
+ {
+ #define TEST_FILE_ACCESS(path) do { if (g_access(path, R_OK)!=0) g_debug("Cannot access %s\n", path);} while (0)
+-	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/icons/" PACKAGE ".png");
++	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE ".png");
+ 	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority1.png");
+ 	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority2.png");
+ 	TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority3.png");
diff --git a/media-gfx/rawstudio/rawstudio-0.7.ebuild b/media-gfx/rawstudio/rawstudio-0.7.ebuild
deleted file mode 100644
index 1597f9093e66..000000000000
--- a/media-gfx/rawstudio/rawstudio-0.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/rawstudio-0.7.ebuild,v 1.1 2008/02/04 15:08:49 drac Exp $
-
-inherit eutils
-
-DESCRIPTION="a program to read and manipulate raw images from digital cameras."
-HOMEPAGE="http://rawstudio.org"
-SRC_URI="http://${PN}.org/files/release/${P}.tar.gz"
-
-LICENSE="GPL-2 CCPL-Attribution-NoDerivs-2.5"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/jpeg
-	media-libs/tiff
-	>=x11-libs/gtk+-2
-	>=dev-libs/libxml2-2.4
-	media-libs/lcms
-	>=gnome-base/gconf-2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.6-desktop-entry.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-gfx/rawstudio/rawstudio-0.6.ebuild b/media-gfx/rawstudio/rawstudio-1.0.ebuild
index c044d3ac1ae5..185c051f6d1f 100644
--- a/media-gfx/rawstudio/rawstudio-0.6.ebuild
+++ b/media-gfx/rawstudio/rawstudio-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/rawstudio-0.6.ebuild,v 1.2 2008/02/04 10:07:25 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/rawstudio-1.0.ebuild,v 1.1 2008/05/03 08:48:45 drac Exp $
 
 inherit eutils
 
@@ -15,10 +15,11 @@ IUSE=""
 
 RDEPEND="media-libs/jpeg
 	media-libs/tiff
-	>=x11-libs/gtk+-2
+	>=x11-libs/gtk+-2.8
 	>=dev-libs/libxml2-2.4
 	media-libs/lcms
-	>=gnome-base/gconf-2"
+	>=gnome-base/gconf-2
+	sys-apps/dbus"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext"
@@ -26,7 +27,12 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-desktop-entry.patch
+	epatch "${FILESDIR}"/${P}-desktop-entry-and-pixmaps-directory.patch
+}
+
+src_compile() {
+	econf --disable-dependency-tracking
+	emake || die "emake failed."
 }
 
 src_install() {