Version bump from the gnustep overlay

Package-Manager: portage-2.1.3.9

11 files changed, 515 insertions, 139 deletions

diff --git a/gnustep-apps/gworkspace/ChangeLog b/gnustep-apps/gworkspace/ChangeLog
index b4ad7ba2eaf8..431b0fd18c22 100644
--- a/gnustep-apps/gworkspace/ChangeLog
+++ b/gnustep-apps/gworkspace/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnustep-apps/gworkspace
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/ChangeLog,v 1.21 2007/01/05 07:07:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/ChangeLog,v 1.22 2007/09/10 16:24:07 voyageur Exp $
+
+*gworkspace-0.8.6 (10 Sep 2007)
+
+  10 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/gworkspace-0.8.6-popplerkit.patch,
+  +files/gworkspace-0.8.6-rpath.patch,
+  -files/seperate-desktop-recycler.patch, -gworkspace-0.8.2.ebuild,
+  -gworkspace-0.8.3.ebuild, +gworkspace-0.8.6.ebuild:
+  Version bump from the GNUstep overlay, remove old versions
+  Also switched pdf depend on popplerkit instead of pdfkit
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   gworkspace-0.8.3.ebuild:
diff --git a/gnustep-apps/gworkspace/Manifest b/gnustep-apps/gworkspace/Manifest
index b3962f06dc97..0bd6251fc4dd 100644
--- a/gnustep-apps/gworkspace/Manifest
+++ b/gnustep-apps/gworkspace/Manifest
@@ -1,26 +1,25 @@
-AUX seperate-desktop-recycler.patch 316 RMD160 6dbd5313242c4c5fb736710136850b1c0aad9bcb SHA1 5109b31a9a6f60246db0f0e0bae054fe33944a63 SHA256 df3bee5277f8d6b8d6006f4051ad8242a99fd3383e5b817fe0013a1b57fa1474
-MD5 660807348555935d3d149797044803b3 files/seperate-desktop-recycler.patch 316
-RMD160 6dbd5313242c4c5fb736710136850b1c0aad9bcb files/seperate-desktop-recycler.patch 316
-SHA256 df3bee5277f8d6b8d6006f4051ad8242a99fd3383e5b817fe0013a1b57fa1474 files/seperate-desktop-recycler.patch 316
+AUX gworkspace-0.8.6-popplerkit.patch 11861 RMD160 2b0dddb70dfbcc26652556fee530e59554916156 SHA1 bc3bba15aaef7edb42b95087dcab5ac67f4b862d SHA256 eba9ddc0359b144e57d2e02344e79137cb35faf25345994d1832a7e37b619f5b
+MD5 42c6ee2989c9d535a86212feb7bcbca4 files/gworkspace-0.8.6-popplerkit.patch 11861
+RMD160 2b0dddb70dfbcc26652556fee530e59554916156 files/gworkspace-0.8.6-popplerkit.patch 11861
+SHA256 eba9ddc0359b144e57d2e02344e79137cb35faf25345994d1832a7e37b619f5b files/gworkspace-0.8.6-popplerkit.patch 11861
+AUX gworkspace-0.8.6-rpath.patch 2425 RMD160 e941cd704c512bb7b4371a9084735ec880f14828 SHA1 407ae008adec7c2e5e06c11cc0531e4c8fdb3729 SHA256 1492560792a91b609377f826a5692efc148f2aaf9377048a639c303f22e7555d
+MD5 22ccd7a5f73cd207141551b02cc3b6fa files/gworkspace-0.8.6-rpath.patch 2425
+RMD160 e941cd704c512bb7b4371a9084735ec880f14828 files/gworkspace-0.8.6-rpath.patch 2425
+SHA256 1492560792a91b609377f826a5692efc148f2aaf9377048a639c303f22e7555d files/gworkspace-0.8.6-rpath.patch 2425
 DIST gworkspace-0.7.1.tar.gz 1412129 RMD160 5fb43c7faaf0a2a46a150011a34ac21ab074bb39 SHA1 f1679a2d507e2ccc35e1cb06bbdea7e2864c4528 SHA256 b4a0f066a9746c876cb17f54816e16e4352305e233bf50996e99f0bf8d7a50b7
-DIST gworkspace-0.8.2.tar.gz 3884132 RMD160 bdbc5bd749a45e207bc9ffac1d6cf136324b783b SHA1 a66b9c9f7f50e95c99b139e0ac2b7a48fe012856 SHA256 b53f26cc40f70baf40f78159c3aaed0bb8565cd14dca532d0a8b73f9ec4bb2e0
-DIST gworkspace-0.8.3.tar.gz 4734645 RMD160 d6a343c1c512c20b9187c209e84c34e9cfc62a10 SHA1 292825d45f793b1cb0e21a58c706fa4e73cf0d44 SHA256 747df49830cdfaa96cbfa2e2f7b2d52b574ccc26d9f7c10ac40b84a2329ed6bf
+DIST gworkspace-0.8.6.tar.gz 2394844 RMD160 72fc3a2f4bc5db616509ec6c30bc135aca2a8900 SHA1 19cf899f8c85585926c9449520e6f770710d7787 SHA256 50fff3595d6034223a6735822dd63121842d33f9e6d00f4197e5c8a9488365ea
 EBUILD gworkspace-0.7.1.ebuild 811 RMD160 c2d54805589972f397cec8abd38174decb1fc2cb SHA1 dd635be993e78dd86778f59e8a2de14f37abc5f9 SHA256 915f1ddf8916a7d8127d988c0ad0123b2d1fb3837e46304b69675cbe15d82e9b
 MD5 1aaa3b9bc61b9fd0e2db4cc9e0c7e8e4 gworkspace-0.7.1.ebuild 811
 RMD160 c2d54805589972f397cec8abd38174decb1fc2cb gworkspace-0.7.1.ebuild 811
 SHA256 915f1ddf8916a7d8127d988c0ad0123b2d1fb3837e46304b69675cbe15d82e9b gworkspace-0.7.1.ebuild 811
-EBUILD gworkspace-0.8.2.ebuild 811 RMD160 7bebf395291e23192d4430d77ff10d1f9bfe2967 SHA1 01c0eb18a040338af7d34a968700d0726a493713 SHA256 cc1e8446b44df59fad9d0cc350a955355efdad2dc54c4b1ccb3d040e8f94f0f3
-MD5 bcf4d0fb3f1541539fb6549436bc45d4 gworkspace-0.8.2.ebuild 811
-RMD160 7bebf395291e23192d4430d77ff10d1f9bfe2967 gworkspace-0.8.2.ebuild 811
-SHA256 cc1e8446b44df59fad9d0cc350a955355efdad2dc54c4b1ccb3d040e8f94f0f3 gworkspace-0.8.2.ebuild 811
-EBUILD gworkspace-0.8.3.ebuild 2113 RMD160 33b0f2047a768af562385fe32b7bd85becdc3715 SHA1 aa8495ac9ca671738462969e63dcedd08120b06a SHA256 9faf15a24d0642fa2cbf9304221e323275e02fbd358aa318bec563202ba5c0bf
-MD5 958cfa37c71438fdce8da47b5f6ea254 gworkspace-0.8.3.ebuild 2113
-RMD160 33b0f2047a768af562385fe32b7bd85becdc3715 gworkspace-0.8.3.ebuild 2113
-SHA256 9faf15a24d0642fa2cbf9304221e323275e02fbd358aa318bec563202ba5c0bf gworkspace-0.8.3.ebuild 2113
-MISC ChangeLog 4903 RMD160 bf34b003c76ff3a1b3f79c03842eeaf4c5a3cb6f SHA1 2dc3832b65f979c9a37ddf7ac4d7168df93fe8dc SHA256 370dea801f5f0704966c20791eca97e4509299bbc638b0f679f5c2f4ede58f22
-MD5 991f85883e9ee79d31cdc63821464302 ChangeLog 4903
-RMD160 bf34b003c76ff3a1b3f79c03842eeaf4c5a3cb6f ChangeLog 4903
-SHA256 370dea801f5f0704966c20791eca97e4509299bbc638b0f679f5c2f4ede58f22 ChangeLog 4903
+EBUILD gworkspace-0.8.6.ebuild 1324 RMD160 7f3fdacec26ec2a8d342053ff228353fd268f0ff SHA1 40d660b051dcf26c31b659154fe7b614e5ebb047 SHA256 68c278a295b6c6be6560b13c58f633490836efe793207cbda41b8cdfc9874345
+MD5 9b982cd1590bba326bf8f1d47bf728db gworkspace-0.8.6.ebuild 1324
+RMD160 7f3fdacec26ec2a8d342053ff228353fd268f0ff gworkspace-0.8.6.ebuild 1324
+SHA256 68c278a295b6c6be6560b13c58f633490836efe793207cbda41b8cdfc9874345 gworkspace-0.8.6.ebuild 1324
+MISC ChangeLog 5316 RMD160 2f4ee460c66cc41ed602ab87de9781e0ed4c1cff SHA1 c67276ff9b14ba0e56a8e9457e03195daa623f42 SHA256 31576fd12183ce1d1ead2ed90f4f4cb9f5f725edf7e51bd008753dcfcf0d7c58
+MD5 30fabd5a6f0247d2adc99f57a6589e72 ChangeLog 5316
+RMD160 2f4ee460c66cc41ed602ab87de9781e0ed4c1cff ChangeLog 5316
+SHA256 31576fd12183ce1d1ead2ed90f4f4cb9f5f725edf7e51bd008753dcfcf0d7c58 ChangeLog 5316
 MISC metadata.xml 391 RMD160 902157d53596d3f5938e2dd0a6ffa068233f77d3 SHA1 6f31006e6f6b6d83d45113e5b1413bb61a000f0b SHA256 406c4ee08f8ef51e0f9d7a826c3024b8e080094ae4c7e9df093f91355609365a
 MD5 144bf372071e2a59ced95e82e91531bd metadata.xml 391
 RMD160 902157d53596d3f5938e2dd0a6ffa068233f77d3 metadata.xml 391
@@ -28,9 +27,6 @@ SHA256 406c4ee08f8ef51e0f9d7a826c3024b8e080094ae4c7e9df093f91355609365a metadata
 MD5 72d48fa0efcd2b2228291e4e7b968092 files/digest-gworkspace-0.7.1 253
 RMD160 02cf3bacc7a52e73d15ae733d70cf007c69ae7ae files/digest-gworkspace-0.7.1 253
 SHA256 a5348108d4f2503b76c2778d5e3631f5e019a61f59a4a2953e90ea090d8d6aee files/digest-gworkspace-0.7.1 253
-MD5 1a556118e8211d8cb4c3584b694e3a38 files/digest-gworkspace-0.8.2 253
-RMD160 d31fc7dbb8955eb5a2d4fdde8b158bf2b768e14f files/digest-gworkspace-0.8.2 253
-SHA256 939d247f93a62adf1d20b78b6c5e3139afb4f29f00d4132d710d61323c30e2e2 files/digest-gworkspace-0.8.2 253
-MD5 9bebd6a129c1182e640e3de743505f9a files/digest-gworkspace-0.8.3 253
-RMD160 af3498423ab74006637de7ee4635bd8a2c1916d4 files/digest-gworkspace-0.8.3 253
-SHA256 1cee3e59b2f983078a3275ab014428d12e7db7448d50eaae983617746e159747 files/digest-gworkspace-0.8.3 253
+MD5 42dce6eeb2ded2fecabb0c115c18573e files/digest-gworkspace-0.8.6 253
+RMD160 e7035ea744aab2aea6c1369edc7392594d151d94 files/digest-gworkspace-0.8.6 253
+SHA256 fa4215f36e765d081595bb10c46c09d1b30efd43c6d7c65ac5f7135233c8e263 files/digest-gworkspace-0.8.6 253
diff --git a/gnustep-apps/gworkspace/files/digest-gworkspace-0.8.2 b/gnustep-apps/gworkspace/files/digest-gworkspace-0.8.2
deleted file mode 100644
index 80f5c01ff534..000000000000
--- a/gnustep-apps/gworkspace/files/digest-gworkspace-0.8.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 61640e3bb7df6157b25f38c81ec1940e gworkspace-0.8.2.tar.gz 3884132
-RMD160 bdbc5bd749a45e207bc9ffac1d6cf136324b783b gworkspace-0.8.2.tar.gz 3884132
-SHA256 b53f26cc40f70baf40f78159c3aaed0bb8565cd14dca532d0a8b73f9ec4bb2e0 gworkspace-0.8.2.tar.gz 3884132
diff --git a/gnustep-apps/gworkspace/files/digest-gworkspace-0.8.3 b/gnustep-apps/gworkspace/files/digest-gworkspace-0.8.3
deleted file mode 100644
index b0a22d62e5a0..000000000000
--- a/gnustep-apps/gworkspace/files/digest-gworkspace-0.8.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 665d4d9e2a53979fa1e49afccf929bda gworkspace-0.8.3.tar.gz 4734645
-RMD160 d6a343c1c512c20b9187c209e84c34e9cfc62a10 gworkspace-0.8.3.tar.gz 4734645
-SHA256 747df49830cdfaa96cbfa2e2f7b2d52b574ccc26d9f7c10ac40b84a2329ed6bf gworkspace-0.8.3.tar.gz 4734645
diff --git a/gnustep-apps/gworkspace/files/digest-gworkspace-0.8.6 b/gnustep-apps/gworkspace/files/digest-gworkspace-0.8.6
new file mode 100644
index 000000000000..fa6ef3d65fe0
--- /dev/null
+++ b/gnustep-apps/gworkspace/files/digest-gworkspace-0.8.6
@@ -0,0 +1,3 @@
+MD5 16dc6b077517b60897cc0d057bb803f5 gworkspace-0.8.6.tar.gz 2394844
+RMD160 72fc3a2f4bc5db616509ec6c30bc135aca2a8900 gworkspace-0.8.6.tar.gz 2394844
+SHA256 50fff3595d6034223a6735822dd63121842d33f9e6d00f4197e5c8a9488365ea gworkspace-0.8.6.tar.gz 2394844
diff --git a/gnustep-apps/gworkspace/files/gworkspace-0.8.6-popplerkit.patch b/gnustep-apps/gworkspace/files/gworkspace-0.8.6-popplerkit.patch
new file mode 100644
index 000000000000..4a74b94ee416
--- /dev/null
+++ b/gnustep-apps/gworkspace/files/gworkspace-0.8.6-popplerkit.patch
@@ -0,0 +1,372 @@
+diff -Naur GWorkspace-0.8.5.orig/Inspector/aclocal.m4 GWorkspace-0.8.5/Inspector/aclocal.m4
+--- GWorkspace-0.8.5.orig/Inspector/aclocal.m4	2007-06-05 22:13:59.000000000 +0200
++++ GWorkspace-0.8.5/Inspector/aclocal.m4	2007-06-05 22:21:16.000000000 +0200
+@@ -1,4 +1,4 @@
+-AC_DEFUN(AC_CHECK_PDFKIT,[
++AC_DEFUN(AC_CHECK_POPPLERKIT,[
+   
+   GNUSTEP_SH_EXPORT_ALL_VARIABLES=yes
+   . "$GNUSTEP_MAKEFILES/GNUstep.sh"
+@@ -31,47 +31,47 @@
+   LDFLAGS="$LDFLAGS $PREFIX$GNUSTEP_SYSTEM_LIBRARIES $PREFIX$GNUSTEP_LOCAL_LIBRARIES"
+   OLD_LIBS="$LIBS"
+   LIBS="-lgnustep-gui"
+-  AC_MSG_CHECKING([for PDFKit])
++  AC_MSG_CHECKING([for PopplerKit])
+ 
+-  LIBS="$LIBS -lPDFKit"
++  LIBS="$LIBS -lPopplerKit"
+ 
+   AC_LINK_IFELSE(
+           AC_LANG_PROGRAM(
+                   [[#include <Foundation/Foundation.h>
+                     #include <AppKit/AppKit.h>
+-                    #include <PDFKit/PDFDocument.h>]],
+-                  [[[[PDFDocument class]];]]),
++                    #include <PopplerKit/PopplerDocument.h>]],
++                  [[[[PopplerDocument class]];]]),
+ 	  $1;
+-	  have_pdfkit=yes,
++	  have_popplerkit=yes,
+ 	  $2;
+-	  have_pdfkit=no)
++	  have_popplerkit=no)
+ 
+   LIBS="$OLD_LIBS"
+   CPPFLAGS="$OLD_CPPFLAGS"
+   LDFLAGS="$OLD_LDFLAGS"
+   CFLAGS="$OLD_CFLAGS"
+ 
+-  AC_MSG_RESULT($have_pdfkit)
++  AC_MSG_RESULT($have_popplerkit)
+ ])
+ 
+ 
+-AC_DEFUN(AC_CHECK_PDFKIT_DARWIN,[
+-  AC_MSG_CHECKING([for PDFKit])
+-  PDF_H="PDFKit/PDFDocument.h"
++AC_DEFUN(AC_CHECK_POPPLERKIT_DARWIN,[
++  AC_MSG_CHECKING([for PopplerKit])
++  PDF_H="PopplerKit/PopplerDocument.h"
+   PDF_H_PATH="$GNUSTEP_SYSTEM_HEADERS/$PDF_H"
+ 
+   if test -e $PDF_H_PATH; then
+-    have_pdfkit=yes
++    have_popplerkit=yes
+   else 
+     PDF_H_PATH="$GNUSTEP_LOCAL_HEADERS/$PDF_H"
+     if test -e $PDF_H_PATH; then
+-      have_pdfkit=yes
++      have_popplerkit=yes
+     else 
+-      have_pdfkit=no
++      have_popplerkit=no
+     fi
+   fi
+   
+-  AC_MSG_RESULT($have_pdfkit)
++  AC_MSG_RESULT($have_popplerkit)
+ ])
+ 
+ 
+diff -Naur GWorkspace-0.8.5.orig/Inspector/configure.ac GWorkspace-0.8.5/Inspector/configure.ac
+--- GWorkspace-0.8.5.orig/Inspector/configure.ac	2007-06-05 22:13:59.000000000 +0200
++++ GWorkspace-0.8.5/Inspector/configure.ac	2007-06-05 22:15:43.000000000 +0200
+@@ -55,23 +55,23 @@
+ AC_DEFINE_UNQUOTED([FILEPATH], ["$FILE_PATH"], [Path to file])
+ 
+ #--------------------------------------------------------------------
+-# We need PDFKit
++# We need PopplerKit
+ #--------------------------------------------------------------------
+ case "$target_os" in
+   darwin*)
+-    AC_CHECK_PDFKIT_DARWIN(have_pdfkit=yes, have_pdfkit=no)
++    AC_CHECK_POPPLERKIT_DARWIN(have_popplerkit=yes, have_popplerkit=no)
+     ;;
+   *)	
+-    AC_CHECK_PDFKIT(have_pdfkit=yes, have_pdfkit=no)
++    AC_CHECK_POPPLERKIT(have_popplerkit=yes, have_popplerkit=no)
+     ;;
+ esac
+ 
+-if test "$have_pdfkit" = "no"; then
+-  AC_MSG_NOTICE([The PDFKit framework can't be found.])
++if test "$have_popplerkit" = "no"; then
++  AC_MSG_NOTICE([The PopplerKit framework can't be found.])
+   AC_MSG_NOTICE([The pdf viewer will not be built.])  
+ fi
+ 
+-AC_SUBST(have_pdfkit)
++AC_SUBST(have_popplerkit)
+ 
+ AC_CONFIG_FILES([GNUmakefile inspector.make])
+ AC_OUTPUT
+diff -Naur GWorkspace-0.8.5.orig/Inspector/ContentViewers/GNUmakefile GWorkspace-0.8.5/Inspector/ContentViewers/GNUmakefile
+--- GWorkspace-0.8.5.orig/Inspector/ContentViewers/GNUmakefile	2007-06-05 22:13:59.000000000 +0200
++++ GWorkspace-0.8.5/Inspector/ContentViewers/GNUmakefile	2007-06-05 22:15:43.000000000 +0200
+@@ -6,7 +6,7 @@
+ 
+ include ../inspector.make
+ 
+-ifneq ($(PDFKIT),no)
++ifneq ($(POPPLERKIT),no)
+ SUBPROJECTS = \
+   FolderViewer \
+   ImageViewer \
+diff -Naur GWorkspace-0.8.5.orig/Inspector/ContentViewers/GNUmakefile.orig GWorkspace-0.8.5/Inspector/ContentViewers/GNUmakefile.orig
+--- GWorkspace-0.8.5.orig/Inspector/ContentViewers/GNUmakefile.orig	1970-01-01 01:00:00.000000000 +0100
++++ GWorkspace-0.8.5/Inspector/ContentViewers/GNUmakefile.orig	2007-02-23 14:14:24.000000000 +0100
+@@ -0,0 +1,41 @@
++# Install into the system root by default
++GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
++RPM_DISABLE_RELOCATABLE=YES
++
++include $(GNUSTEP_MAKEFILES)/common.make
++
++include ../inspector.make
++
++ifneq ($(PDFKIT),no)
++SUBPROJECTS = \
++  FolderViewer \
++  ImageViewer \
++  SoundViewer \
++  AppViewer \
++  RtfViewer \
++  PdfViewer \
++  NSTIFFViewer \
++  NSRTFViewer \
++  NSColorViewer \
++  IBViewViewer
++else
++SUBPROJECTS = \
++  FolderViewer \
++  ImageViewer \
++  SoundViewer \
++  AppViewer \
++  RtfViewer \
++  NSTIFFViewer \
++  NSRTFViewer \
++  NSColorViewer \
++  IBViewViewer
++endif
++
++-include GNUmakefile.preamble
++
++-include GNUmakefile.local
++
++include $(GNUSTEP_MAKEFILES)/aggregate.make
++
++-include GNUmakefile.postamble
++
+diff -Naur GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/GNUmakefile GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/GNUmakefile
+--- GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/GNUmakefile	2007-06-05 22:13:59.000000000 +0200
++++ GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/GNUmakefile	2007-06-05 22:15:43.000000000 +0200
+@@ -11,7 +11,7 @@
+ 
+ OBJCFLAGS += -Wall
+ 
+-PdfViewer_GUI_LIBS += -lPDFKit
++PdfViewer_GUI_LIBS += -lPopplerKit
+ 
+ PdfViewer_OBJC_FILES = PdfViewer.m 
+ 
+diff -Naur GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/GNUmakefile.orig GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/GNUmakefile.orig
+--- GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/GNUmakefile.orig	1970-01-01 01:00:00.000000000 +0100
++++ GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/GNUmakefile.orig	2007-02-23 14:14:24.000000000 +0100
+@@ -0,0 +1,32 @@
++# Install into the system root by default
++GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
++RPM_DISABLE_RELOCATABLE=YES
++
++include $(GNUSTEP_MAKEFILES)/common.make
++
++BUNDLE_NAME = PdfViewer
++BUNDLE_EXTENSION = .inspector
++
++PdfViewer_HAS_RESOURCE_BUNDLE = yes
++
++OBJCFLAGS += -Wall
++
++PdfViewer_GUI_LIBS += -lPDFKit
++
++PdfViewer_OBJC_FILES = PdfViewer.m 
++
++PdfViewer_PRINCIPAL_CLASS = PdfViewer
++
++#PdfViewer_LANGUAGES = English 
++PdfViewer_RESOURCE_FILES = Images/* \
++                           InspectorInfo.plist \
++                           Resources/English.lproj 
++
++#PdfViewer_LOCALIZED_RESOURCE_FILES = Localizable.strings
++
++-include GNUmakefile.preamble
++
++include $(GNUSTEP_MAKEFILES)/bundle.make
++
++-include GNUmakefile.postamble
++
+diff -Naur GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/PdfViewer.h GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/PdfViewer.h
+--- GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/PdfViewer.h	2007-06-05 22:13:59.000000000 +0200
++++ GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/PdfViewer.h	2007-06-05 22:15:43.000000000 +0200
+@@ -46,8 +46,7 @@
+ @class NSTextField;
+ @class NSWorkspace;
+ @class NSButton;
+-@class PDFDocument;
+-@class PDFImageRep;
++@class PopplerDocument;
+ @class NSImage;
+ 
+ @interface PdfViewer : NSView <ContentViewersProtocol>
+@@ -62,8 +61,8 @@
+   NSButton *editButt;
+ 
+   NSString *pdfPath;
+-  PDFDocument *pdfDoc;
+-  PDFImageRep *imageRep;
++  PopplerDocument *pdfDoc;
++  id <PopplerBufferedRenderer> pdfRenderer;
+   
+   id <ContentInspectorProtocol>inspector;
+   NSFileManager *fm;
+diff -Naur GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/PdfViewer.m GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/PdfViewer.m
+--- GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/PdfViewer.m	2007-06-05 22:13:59.000000000 +0200
++++ GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/PdfViewer.m	2007-06-05 22:27:13.000000000 +0200
+@@ -23,8 +23,9 @@
+  */
+ 
+ #include <AppKit/AppKit.h>
+-#include <PDFKit/PDFDocument.h>
+-#include <PDFKit/PDFImageRep.h>
++#include <PopplerKit/PopplerDocument.h>
++#include <PopplerKit/PopplerSplashRenderer.h>
++#include <PopplerKit/PopplerCairoImageRenderer.h>
+ #include <math.h>
+ #include "PdfViewer.h"
+ 
+@@ -38,7 +39,7 @@
+ {
+   TEST_RELEASE (pdfPath);	
+   TEST_RELEASE (pdfDoc);
+-  TEST_RELEASE (imageRep);
++  TEST_RELEASE (pdfRenderer);
+ 	RELEASE (backButt);
+ 	RELEASE (nextButt);
+ 	RELEASE (scroll);
+@@ -158,7 +159,7 @@
+ 
+ - (void)displayPath:(NSString *)path
+ {
+-  PDFDocument *doc;
++  PopplerDocument *doc;
+   
+   ASSIGN (pdfPath, path);
+ 
+@@ -168,11 +169,14 @@
+   
+   [editButt setEnabled: NO];	
+   
+-  doc = [PDFDocument documentFromFile: pdfPath];
++  NS_DURING
++    doc = [PopplerDocument documentWithPath: pdfPath];
++  NS_HANDLER
++    doc = nil;
++  NS_ENDHANDLER
+ 
+-  if ([doc isOk] && ([doc errorCode] == 0)) {
++  if (doc) {
+     int npages;
+-    NSSize imageSize;
+ 	  NSBundle *bundle;
+ 	  NSString *imagePath;
+ 	  NSImage *miniPage;
+@@ -234,13 +238,13 @@
+ 		[matrix sizeToCells];
+ 		RELEASE (miniPage);	    
+ 
+-    DESTROY (imageRep);
++    DESTROY (pdfRenderer);
+     ASSIGN (pdfDoc, doc);
+ 
+-    imageSize = NSMakeSize([pdfDoc pageWidth: 1],
+-                                    [pdfDoc pageHeight: 1]);
+-    imageRep = [[PDFImageRep alloc] initWithDocument: pdfDoc];
+-    [imageRep setSize: imageSize];
++    if ([PopplerCairoImageRenderer isSupported])
++      pdfRenderer = [[PopplerCairoImageRenderer alloc] initWithDocument: pdfDoc];
++    else
++      pdfRenderer = [[PopplerSplashRenderer alloc] initWithDocument: pdfDoc];
+ 
+   } else {
+     if (valid) {
+@@ -276,18 +280,21 @@
+   NSImage *image = nil;
+   int index = [matrix selectedColumn] + 1;
+   NSSize imsize = [imageView bounds].size;
+-  NSSize unscaledSize = NSMakeSize([pdfDoc pageWidth: index], 
+-                                              [pdfDoc pageHeight: index]);  
++  NSSize unscaledSize = [[pdfDoc page: index] size];
++  NSSize scaledSize = unscaledSize;
++  float scaleFactor = 1.0;
++  NSImageRep *imageRep;
+ 
+   if ((imsize.width < unscaledSize.width) 
+                         || (imsize.height < unscaledSize.height)) {
+     float rw, rh;
+-	  NSSize scaledSize;
+     float xfactor, yfactor;  
+ 
+     rw = imsize.width / unscaledSize.width;
+     rh = imsize.height / unscaledSize.height;
+ 
++	scaleFactor = rw <= rh ? rw : rh;
++
+     if (rw <= rh) {
+       scaledSize.width = unscaledSize.width * rw;
+       scaledSize.height = floor(imsize.width * unscaledSize.height / unscaledSize.width + 0.5);
+@@ -295,15 +302,9 @@
+       scaledSize.height = unscaledSize.height * rh;
+       scaledSize.width  = floor(imsize.height * unscaledSize.width / unscaledSize.height + 0.5);    
+     }
+-
+-    xfactor = scaledSize.width / unscaledSize.width * PDFResolution;
+-    yfactor = scaledSize.height / unscaledSize.height * PDFResolution;
+-
+-    [imageRep setResolution: (xfactor < yfactor ? xfactor : yfactor)];
+   }
+ 
+-  [imageRep setPageNum: index];
+-  
++  imageRep = [pdfRenderer renderPage: [pdfDoc page: index] scale: scaleFactor];
+   image = [[NSImage alloc] initWithSize: [imageRep size]];
+   [image setBackgroundColor: [NSColor whiteColor]];
+   [image setScalesWhenResized: YES];
+diff -Naur GWorkspace-0.8.5.orig/Inspector/GNUmakefile.in GWorkspace-0.8.5/Inspector/GNUmakefile.in
+--- GWorkspace-0.8.5.orig/Inspector/GNUmakefile.in	2007-06-05 22:13:59.000000000 +0200
++++ GWorkspace-0.8.5/Inspector/GNUmakefile.in	2007-06-05 22:15:43.000000000 +0200
+@@ -15,9 +15,9 @@
+ Inspector_PRINCIPAL_CLASS = Inspector
+ Inspector_HAS_RESOURCE_BUNDLE = yes
+ 
+-ifneq ($(PDFKIT),no)
+-  Inspector_GUI_LIBS += -lPDFKit
+-  ADDITIONAL_LDFLAGS = -lPDFKit
++ifneq ($(POPPLERKIT),no)
++  Inspector_GUI_LIBS += -lPopplerKit
++  ADDITIONAL_LDFLAGS = -lPopplerKit
+ endif
+ 
+ Inspector_RESOURCE_FILES = \
+diff -Naur GWorkspace-0.8.5.orig/Inspector/inspector.make.in GWorkspace-0.8.5/Inspector/inspector.make.in
+--- GWorkspace-0.8.5.orig/Inspector/inspector.make.in	2007-06-05 22:13:59.000000000 +0200
++++ GWorkspace-0.8.5/Inspector/inspector.make.in	2007-06-05 22:15:43.000000000 +0200
+@@ -2,6 +2,6 @@
+ #   Makefile flags and configs to build with the bundle
+ #
+ 
+-PDFKIT=@have_pdfkit@
++POPPLERKIT=@have_popplerkit@
+ SH_PATH=@SH_PATH@
+ FILE_PATH=@FILE_PATH@
diff --git a/gnustep-apps/gworkspace/files/gworkspace-0.8.6-rpath.patch b/gnustep-apps/gworkspace/files/gworkspace-0.8.6-rpath.patch
new file mode 100644
index 000000000000..ebb0520364ec
--- /dev/null
+++ b/gnustep-apps/gworkspace/files/gworkspace-0.8.6-rpath.patch
@@ -0,0 +1,46 @@
+diff -Naur GWMetadata.old/gmds/mdextractor/GNUmakefile.preamble GWMetadata/gmds/mdextractor/GNUmakefile.preamble
+--- GWMetadata.old/gmds/mdextractor/GNUmakefile.preamble	2007-02-23 14:14:52.000000000 +0100
++++ GWMetadata/gmds/mdextractor/GNUmakefile.preamble	2007-05-03 14:21:57.000000000 +0200
+@@ -12,6 +12,7 @@
+ 
+ ADDITIONAL_LIB_DIRS += -L../../MDKit/MDKit.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) 
+ ADDITIONAL_LIB_DIRS += -L../../../DBKit/$(GNUSTEP_OBJ_DIR)   
++ADDITIONAL_LIB_DIRS += -Wl,-rpath ../../../FSNode/FSNode.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+ 
+ # Additional LDFLAGS to pass to the linker
+ # ADDITIONAL_LDFLAGS += 
+diff -Naur GWMetadata.old/gmds/mdfind/GNUmakefile.preamble GWMetadata/gmds/mdfind/GNUmakefile.preamble
+--- GWMetadata.old/gmds/mdfind/GNUmakefile.preamble	2007-02-23 14:14:50.000000000 +0100
++++ GWMetadata/gmds/mdfind/GNUmakefile.preamble	2007-05-03 14:21:57.000000000 +0200
+@@ -16,6 +16,8 @@
+ 
+ # Additional library directories the linker should search
+ ADDITIONAL_LIB_DIRS += -L../../MDKit/MDKit.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) 
++ADDITIONAL_LIB_DIRS += -Wl,-rpath ../../../FSNode/FSNode.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
++ADDITIONAL_LIB_DIRS += -Wl,-rpath ../../../DBKit/$(GNUSTEP_OBJ_DIR)
+                       
+ 
+ ADDITIONAL_TOOL_LIBS +=
+diff -Naur GWMetadata.old/GNUmakefile.preamble GWMetadata/GNUmakefile.preamble
+--- GWMetadata.old/GNUmakefile.preamble	2007-02-23 14:14:55.000000000 +0100
++++ GWMetadata/GNUmakefile.preamble	2007-05-03 14:21:57.000000000 +0200
+@@ -15,7 +15,7 @@
+ ADDITIONAL_LDFLAGS +=  
+ 
+ # Additional library directories the linker should search
+-ADDITIONAL_LIB_DIRS += 
++ADDITIONAL_LIB_DIRS += -Wl,-rpath ../../../FSNode/FSNode.framework/Versions/0
+                       
+ 
+ ADDITIONAL_TOOL_LIBS +=
+diff -Naur GWMetadata.old/MDFinder/GNUmakefile.preamble GWMetadata/MDFinder/GNUmakefile.preamble
+--- GWMetadata.old/MDFinder/GNUmakefile.preamble	2007-02-23 14:14:44.000000000 +0100
++++ GWMetadata/MDFinder/GNUmakefile.preamble	2007-05-03 14:21:57.000000000 +0200
+@@ -13,6 +13,7 @@
+ 
+ ADDITIONAL_LIB_DIRS += -L../MDKit/MDKit.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR) 
+ ADDITIONAL_LIB_DIRS += -L../../FSNode/FSNode.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
++ADDITIONAL_LIB_DIRS += -Wl,-rpath ../../DBKit/$(GNUSTEP_OBJ_DIR)
+ 
+ # Additional LDFLAGS to pass to the linker
+ # ADDITIONAL_LDFLAGS += 
diff --git a/gnustep-apps/gworkspace/files/seperate-desktop-recycler.patch b/gnustep-apps/gworkspace/files/seperate-desktop-recycler.patch
deleted file mode 100644
index 8ade945cf39c..000000000000
--- a/gnustep-apps/gworkspace/files/seperate-desktop-recycler.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- GNUmakefile.in	2004-10-05 11:21:56.029398848 -0400
-+++ GNUmakefile.in	2004-10-05 11:22:16.076351248 -0400
-@@ -17,8 +17,6 @@
- 	      			  Inspector \
- 	      			  Operation \
-                 Finder \
--	      			  Desktop \
--	      			  Recycler \
- 	      			  GWorkspace 
- 						 
- -include GNUmakefile.preamble
diff --git a/gnustep-apps/gworkspace/gworkspace-0.8.2.ebuild b/gnustep-apps/gworkspace/gworkspace-0.8.2.ebuild
deleted file mode 100644
index 88df98fcd19a..000000000000
--- a/gnustep-apps/gworkspace/gworkspace-0.8.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/gworkspace-0.8.2.ebuild,v 1.2 2007/07/13 07:00:14 mr_bones_ Exp $
-
-inherit gnustep
-
-S=${WORKDIR}/${P/gw/GW}
-
-DESCRIPTION="A workspace manager for GNUstep"
-HOMEPAGE="http://www.gnustep.it/enrico/gworkspace/"
-SRC_URI="http://www.gnustep.it/enrico/gworkspace/${P}.tar.gz"
-
-KEYWORDS="~ppc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="pdf"
-DEPEND="${GS_DEPEND}
-	pdf? ( gnustep-libs/pdfkit )
-	!gnustep-apps/desktop
-	!gnustep-apps/recycler"
-RDEPEND="${GS_RDEPEND}
-	pdf? ( gnustep-libs/pdfkit )
-	!gnustep-apps/desktop
-	!gnustep-apps/recycler"
-
-egnustep_install_domain "System"
-
-src_compile() {
-	egnustep_env
-
-	econf || die "configure failed"
-
-	egnustep_make
-}
diff --git a/gnustep-apps/gworkspace/gworkspace-0.8.3.ebuild b/gnustep-apps/gworkspace/gworkspace-0.8.3.ebuild
deleted file mode 100644
index de3e050e0c9e..000000000000
--- a/gnustep-apps/gworkspace/gworkspace-0.8.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/gworkspace-0.8.3.ebuild,v 1.3 2007/07/13 07:00:14 mr_bones_ Exp $
-
-inherit gnustep
-
-S=${WORKDIR}/${P/gw/GW}
-
-DESCRIPTION="A workspace manager for GNUstep"
-HOMEPAGE="http://www.gnustep.it/enrico/gworkspace/"
-SRC_URI="http://www.gnustep.it/enrico/gworkspace/${P}.tar.gz"
-
-KEYWORDS="~ppc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="${IUSE} pdfkit doc"
-DEPEND="${GS_DEPEND}
-	pdfkit? ( =gnustep-libs/pdfkit-0.9* )
-	gnustep-apps/systempreferences
-	>=dev-db/sqlite-3.2.8
-	!gnustep-apps/desktop
-	!gnustep-apps/recycler"
-RDEPEND="${GS_RDEPEND}
-	pdfkit? ( =gnustep-libs/pdfkit-0.9* )
-	gnustep-apps/systempreferences
-	>=dev-db/sqlite-3.2.8
-	!gnustep-apps/desktop
-	!gnustep-apps/recycler"
-
-egnustep_install_domain "System"
-
-src_compile() {
-	egnustep_env
-
-	# Non-flattened env
-	export CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_ROOT/Library/Headers -I$GNUSTEP_LOCAL_ROOT/Library/Headers -I$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO -I$GNUSTEP_LOCAL_ROOT/Library/Headers/$LIBRARY_COMBO -I$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS -I$GNUSTEP_LOCAL_ROOT/Library/Headers/$LIBRARY_COMBO/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS"
-	export LDFLAGS="$LDFLAGS -L$GNUSTEP_SYSTEM_ROOT/Library/Libraries -L$GNUSTEP_LOCAL_ROOT/Library/Libraries -L$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$LIBRARY_COMBO -L$GNUSTEP_LOCAL_ROOT/Library/Libraries/$LIBRARY_COMBO -L$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO -L$GNUSTEP_LOCAL_ROOT/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO"
-
-	econf || die "configure failed"
-	egnustep_make || die "make failed"
-
-	cd ${S}/GWMetadata
-	ln -s ../DBKit
-	econf || die "GWMetadata configure failed"
-	egnustep_make || die "GWMetadata make failed"
-}
-
-src_install() {
-	egnustep_env
-
-	egnustep_install
-
-	cd ${S}/GWMetadata
-	egnustep_install
-
-	if use doc;
-	then
-		dodir /usr/share/doc/${PF}
-		cp ${S}/Documentation/*.pdf ${D}/usr/share/doc/${PF}
-	fi
-}
diff --git a/gnustep-apps/gworkspace/gworkspace-0.8.6.ebuild b/gnustep-apps/gworkspace/gworkspace-0.8.6.ebuild
new file mode 100644
index 000000000000..06dbaf03a045
--- /dev/null
+++ b/gnustep-apps/gworkspace/gworkspace-0.8.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/gworkspace-0.8.6.ebuild,v 1.1 2007/09/10 16:24:07 voyageur Exp $
+
+inherit autotools gnustep-2
+
+S=${WORKDIR}/${P/gw/GW}
+
+DESCRIPTION="A workspace manager for GNUstep"
+HOMEPAGE="http://www.gnustep.it/enrico/gworkspace/"
+SRC_URI="http://www.gnustep.it/enrico/gworkspace/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="pdf"
+DEPEND="pdf? ( gnustep-libs/popplerkit )
+	>=gnustep-apps/systempreferences-1.0.1_p24791
+	>=dev-db/sqlite-3.2.8"
+RDEPEND="!gnustep-apps/desktop
+	!gnustep-apps/recycler"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch ${FILESDIR}/${P}-rpath.patch
+	epatch ${FILESDIR}/${P}-popplerkit.patch
+
+	cd Inspector
+	eautoreconf || die "failed running autoreconf"
+}
+
+src_compile() {
+	local myconf=""
+
+	use kernel_linux && myconf="${myconf} --with-inotify"
+
+	egnustep_env
+	econf ${myconf}
+	egnustep_make
+
+	cd "${S}"/GWMetadata
+	econf || die "GWMetadata configure failed"
+	egnustep_make || die "GWMetadata make failed"
+}
+
+src_install() {
+	egnustep_env
+
+	egnustep_install
+
+	cd "${S}"/GWMetadata
+	egnustep_install
+
+	if use doc;
+	then
+		dodir /usr/share/doc/${PF}
+		cp "${S}"/Documentation/*.pdf "${D}"/usr/share/doc/${PF}
+	fi
+}
+