7 files changed, 17 insertions, 73 deletions

diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index fbf89de..8d72fbb 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -1,38 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX lazarus-0.9.20-fpcsrc.patch 333 RMD160 2afa08d4a5e11c38dd3e6b6907c117b00c5b523f SHA1 3e5c47eac41249dd2c78321be6ae9604b8d55931 SHA256 2ebf6b5a9a5ff2746339c2b6bfe4149c663803fa4dfe98408240b33cdf1f544c
-MD5 728fbd094be35bcec4b8e9b83eea9b6a files/lazarus-0.9.20-fpcsrc.patch 333
-RMD160 2afa08d4a5e11c38dd3e6b6907c117b00c5b523f files/lazarus-0.9.20-fpcsrc.patch 333
-SHA256 2ebf6b5a9a5ff2746339c2b6bfe4149c663803fa4dfe98408240b33cdf1f544c files/lazarus-0.9.20-fpcsrc.patch 333
-AUX lazarus-0.9.20-lcl-handle.patch 892 RMD160 96177a04128f2c7946feb320427ba8d2e287c9e7 SHA1 211f7c87bab790da12c3b10c5c4e82a111422172 SHA256 ad1f7bffdecbcc7b599463d4cc41fe20c705f34475d0ddbae8941fad2bf79f0a
-MD5 8bdf8590957bf2a6a8253a3bcb85a4bf files/lazarus-0.9.20-lcl-handle.patch 892
-RMD160 96177a04128f2c7946feb320427ba8d2e287c9e7 files/lazarus-0.9.20-lcl-handle.patch 892
-SHA256 ad1f7bffdecbcc7b599463d4cc41fe20c705f34475d0ddbae8941fad2bf79f0a files/lazarus-0.9.20-lcl-handle.patch 892
-AUX lazarus-0.9.20-lclintf.patch 266 RMD160 0e3e711034be39f7cda9375a5df5b7f0dd150a1c SHA1 4fdedeb7a33588e216367de2d3ad3004b4535f00 SHA256 400c2e5bf2183d2e21a930a752701d62a4d75fc552111cf7a5c366f6e745eee5
-MD5 c24d1e618b5b6d3d1a1948b12d40491c files/lazarus-0.9.20-lclintf.patch 266
-RMD160 0e3e711034be39f7cda9375a5df5b7f0dd150a1c files/lazarus-0.9.20-lclintf.patch 266
-SHA256 400c2e5bf2183d2e21a930a752701d62a4d75fc552111cf7a5c366f6e745eee5 files/lazarus-0.9.20-lclintf.patch 266
-DIST lazarus-0.9.20-0.tar.gz 10241274 RMD160 5a2c061e42306008858cf8b3a51ecaa1aa3f0bca SHA1 6f72cda6ed67d4855118c9147d46ff575232bed1 SHA256 c3416c557e510c9fcca5de59f128854eb5605f69fc7472cea11fc09ed5f8285e
-EBUILD lazarus-0.9.20-r1.ebuild 2442 RMD160 eb446d920764cb288b01b09985ca84c74234e201 SHA1 3cad7e32cd67aa19920d7c0353d506631eedb5e2 SHA256 b26c18c6a3c9579c699c2454867797e3db860c13f61b06fee0e4334842af0c14
-MD5 c5de263ff404148ed4b8cdd609b02d76 lazarus-0.9.20-r1.ebuild 2442
-RMD160 eb446d920764cb288b01b09985ca84c74234e201 lazarus-0.9.20-r1.ebuild 2442
-SHA256 b26c18c6a3c9579c699c2454867797e3db860c13f61b06fee0e4334842af0c14 lazarus-0.9.20-r1.ebuild 2442
+AUX lazarus-0.9.22-fpcsrc.patch 333 RMD160 2afa08d4a5e11c38dd3e6b6907c117b00c5b523f SHA1 3e5c47eac41249dd2c78321be6ae9604b8d55931 SHA256 2ebf6b5a9a5ff2746339c2b6bfe4149c663803fa4dfe98408240b33cdf1f544c
+MD5 728fbd094be35bcec4b8e9b83eea9b6a files/lazarus-0.9.22-fpcsrc.patch 333
+RMD160 2afa08d4a5e11c38dd3e6b6907c117b00c5b523f files/lazarus-0.9.22-fpcsrc.patch 333
+SHA256 2ebf6b5a9a5ff2746339c2b6bfe4149c663803fa4dfe98408240b33cdf1f544c files/lazarus-0.9.22-fpcsrc.patch 333
+DIST lazarus-0.9.22-1.tar.gz 9231360 RMD160 c9536b7b33079ef5ca917d5f31013257cf3d08f8 SHA1 c2c257d6024af04da318085e4efd4482241f9f40 SHA256 ba4402079ad6e081f6c9f08bc171281ce4cd3063ab9d47baf3b744296f4c322b
+EBUILD lazarus-0.9.22.ebuild 2253 RMD160 8bea68e185b582c1ec72e6533dd018bc7e2722f1 SHA1 804f3d30a2e179a31ad37ffb42ddd51c923fb746 SHA256 198eb156ee6f937590fe165f2f1714f5823cf314aa83fa5a13a54fb0ac4f2025
+MD5 abac9b1d53bed702d31c62455f7fc627 lazarus-0.9.22.ebuild 2253
+RMD160 8bea68e185b582c1ec72e6533dd018bc7e2722f1 lazarus-0.9.22.ebuild 2253
+SHA256 198eb156ee6f937590fe165f2f1714f5823cf314aa83fa5a13a54fb0ac4f2025 lazarus-0.9.22.ebuild 2253
 MISC ChangeLog 2315 RMD160 6ee29209987f8d952cb0587ad2a0798e8cf60693 SHA1 002b4ee6b3f8e4b48fa6a77cb25a72d5d45ab788 SHA256 dc35eb0570e5c2e48df29261463e4a1986f6af55eb07862421788e0e4cadfdad
 MD5 95db940b66ec4fbaefb5841f3d676695 ChangeLog 2315
 RMD160 6ee29209987f8d952cb0587ad2a0798e8cf60693 ChangeLog 2315
 SHA256 dc35eb0570e5c2e48df29261463e4a1986f6af55eb07862421788e0e4cadfdad ChangeLog 2315
 MISC metadata.xml 281 RMD160 423ab877620b713044c2d08753af1fa18a3adce4 SHA1 c861318fcfa3725a45dd0deb55fbfc26a49245b6 SHA256 d0d50fc65f6bc2ce65700e4ea995148f15c4e7a0eca5d0f86e3f4b9a73a4aae6
 MD5 8773813255798a06aad7b06e083a1a55 metadata.xml 281
 RMD160 423ab877620b713044c2d08753af1fa18a3adce4 metadata.xml 281
 SHA256 d0d50fc65f6bc2ce65700e4ea995148f15c4e7a0eca5d0f86e3f4b9a73a4aae6 metadata.xml 281
-MD5 84c87b76f87fa0bdfc738b94b819489e files/digest-lazarus-0.9.20-r1 256
-RMD160 e9a791d6655e4d9143e7e71a20dc3b226a99f744 files/digest-lazarus-0.9.20-r1 256
-SHA256 49f58ce799154ff503040c5f74a333cbf4e2b2eac6005a1516a466aa8f597c96 files/digest-lazarus-0.9.20-r1 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGD5oIwnQyISwouHwRArb3AJ9ZBCa4twuYCzk51ahxiBed9OD7NACfcHRp
-cyflKCqj9+nDQi0uVNkO2Tw=
-=dJjH
------END PGP SIGNATURE-----
+MD5 19eb94ae32c483bc9daadf07fa6de42a files/digest-lazarus-0.9.22 253
+RMD160 640b886fea1cab96e42121de1cadf1a66649d439 files/digest-lazarus-0.9.22 253
+SHA256 f8ada9d970f08379d7bd30762552f630cef912a958c879faa04217ca39c29707 files/digest-lazarus-0.9.22 253
diff --git a/dev-lang/lazarus/files/digest-lazarus-0.9.20-r1 b/dev-lang/lazarus/files/digest-lazarus-0.9.20-r1
deleted file mode 100644
index 0f4e94f..0000000
--- a/dev-lang/lazarus/files/digest-lazarus-0.9.20-r1
+++ b/dev/null
@@ -1,3 +0,0 @@
-MD5 8c232dc7cd398578049f57cd97d0d263 lazarus-0.9.20-0.tar.gz 10241274
-RMD160 5a2c061e42306008858cf8b3a51ecaa1aa3f0bca lazarus-0.9.20-0.tar.gz 10241274
-SHA256 c3416c557e510c9fcca5de59f128854eb5605f69fc7472cea11fc09ed5f8285e lazarus-0.9.20-0.tar.gz 10241274
diff --git a/dev-lang/lazarus/files/digest-lazarus-0.9.22 b/dev-lang/lazarus/files/digest-lazarus-0.9.22
new file mode 100644
index 0000000..cda4c1a
--- a/dev/null
+++ b/dev-lang/lazarus/files/digest-lazarus-0.9.22
@@ -0,0 +1,3 @@
+MD5 fb8999646f679775abc8ea4133e0f748 lazarus-0.9.22-1.tar.gz 9231360
+RMD160 c9536b7b33079ef5ca917d5f31013257cf3d08f8 lazarus-0.9.22-1.tar.gz 9231360
+SHA256 ba4402079ad6e081f6c9f08bc171281ce4cd3063ab9d47baf3b744296f4c322b lazarus-0.9.22-1.tar.gz 9231360
diff --git a/dev-lang/lazarus/files/lazarus-0.9.20-lcl-handle.patch b/dev-lang/lazarus/files/lazarus-0.9.20-lcl-handle.patch
deleted file mode 100644
index 772face..0000000
--- a/dev-lang/lazarus/files/lazarus-0.9.20-lcl-handle.patch
+++ b/dev/null
@@ -1,25 +0,0 @@
- If LCLType is not included, then THandle is System.THandle
- rather than LCLType.THandle. System.THandle is 32 bits wide.
-
---- lazarus/lcl/interfaces/gtk/gtkwsdialogs.pp
-+++ lazarus/lcl/interfaces/gtk/gtkwsdialogs.pp
-@@ -29,7 +29,7 @@
- uses
-   {$IFDEF GTK2} Gtk2, Glib2, gdk2, {$ELSE} Gtk, gdk, Glib, {$ENDIF}
-   SysUtils, Classes, Controls, LMessages, InterfaceBase, graphics,
--  Dialogs, WSDialogs, WSLCLClasses, gtkint, gtkproc, gtkwscontrols;
-+  LCLType, Dialogs, WSDialogs, WSLCLClasses, gtkint, gtkproc, gtkwscontrols;
- 
- type
- 
---- lazarus/lcl/widgetset/wsdialogs.pp
-+++ lazarus/lcl/widgetset/wsdialogs.pp
-@@ -44,7 +44,7 @@
- // To get as little as posible circles,
- // uncomment only when needed for registration
- ////////////////////////////////////////////////////
--  Dialogs,
-+  LCLType, Dialogs,
- ////////////////////////////////////////////////////
-   WSLCLClasses, WSControls;
- 
diff --git a/dev-lang/lazarus/files/lazarus-0.9.20-lclintf.patch b/dev-lang/lazarus/files/lazarus-0.9.20-lclintf.patch
deleted file mode 100644
index b515efa..0000000
--- a/dev-lang/lazarus/files/lazarus-0.9.20-lclintf.patch
+++ b/dev/null
@@ -1,11 +0,0 @@
---- lazarus/ide/include/unix/lazbaseconf.inc
-+++ lazarus/ide/include/unix/lazbaseconf.inc
-@@ -180,7 +180,7 @@
- 
- function GetDefaultLCLWidgetType: string;
- begin
--  Result:='gtk';
-+  Result:='gtk2';
- end;
- 
- procedure GetDefaultBrowser(var Browser, Params: string);
diff --git a/dev-lang/lazarus/files/lazarus-0.9.20-fpcsrc.patch b/dev-lang/lazarus/files/lazarus-0.9.22-fpcsrc.patch
index dbde4e0..dbde4e0 100644
--- a/dev-lang/lazarus/files/lazarus-0.9.20-fpcsrc.patch
+++ b/dev-lang/lazarus/files/lazarus-0.9.22-fpcsrc.patch
diff --git a/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild b/dev-lang/lazarus/lazarus-0.9.22.ebuild
index d8c91e4..02c80a4 100644
--- a/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild
+++ b/dev-lang/lazarus/lazarus-0.9.22.ebuild
@@ -1,77 +1,75 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild,v 1.3 2007/04/01 11:39:48 truedfx Exp $
+# $Header: $
 
 inherit eutils
 
 FPCVER="2.0.4"
 
 SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
 LICENSE="GPL-2 LGPL-2.1 LGPL-2.1-linking-exception"
 KEYWORDS="~amd64 ~ppc ~x86"
 DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi."
 HOMEPAGE="http://www.lazarus.freepascal.org/"
 IUSE=""
-SRC_URI="mirror://sourceforge/lazarus/${P}-0.tar.gz"
+SRC_URI="mirror://sourceforge/lazarus/${P}-1.tar.gz"
 
 DEPEND="~dev-lang/fpc-${FPCVER}
         net-misc/rsync
         >=x11-libs/gtk+-2.0"
 
 S=${WORKDIR}/${PN}
 
 pkg_setup() {
         if ! built_with_use "dev-lang/fpc" source; then
             eerror "You need to build dev-lang/fpc with the 'source' USE flag"
             eerror "in order for lazarus to work properly."
             die "lazarus needs fpc built with the 'source' USE to work."
         fi
 }
 
 src_unpack() {
         # check for broken fpc.cfg
         # don't check in pkg_setup since it won't harm binpkgs
                 if grep -q '^[ ]*-Fu.*/lcl$' /etc/fpc.cfg
         then
                 eerror "Your /etc/fpc.cfg automatically adds a LCL directory"
                 eerror "to the list of unit directories. This will break the"
                 eerror "build of lazarus."
                 die "don't set the LCL path in /etc/fpc.cfg"
         fi
 
         unpack ${A}
         sed -e "s/@FPCVER@/${FPCVER}/" "${FILESDIR}"/${P}-fpcsrc.patch \
                 > "${T}"/fpcsrc.patch || die "could not sed fpcsrc patch"
 
         cd "${S}"
-        epatch "${FILESDIR}"/${P}-lclintf.patch
-        epatch "${FILESDIR}"/${P}-lcl-handle.patch
         epatch "${T}"/fpcsrc.patch
 }
 
 src_compile() {
         LCL_PLATFORM=gtk2 emake -j1 || die "make failed!"
 }
 
 src_install() {
         diropts -m0755
         dodir /usr/share
         # Using rsync to avoid unnecessary copies and cleaning...
         # Note: *.o and *.ppu are needed
         rsync -a \
                 --exclude="CVS"     --exclude=".cvsignore" \
                 --exclude="*.ppw"   --exclude="*.ppl" \
                 --exclude="*.ow"    --exclude="*.a"\
                 --exclude="*.rst"   --exclude=".#*" \
                 --exclude="*.~*"    --exclude="*.bak" \
                 --exclude="*.orig"  --exclude="*.rej" \
                 --exclude=".xvpics" --exclude="*.compiled" \
                 --exclude="killme*" --exclude=".gdb_hist*" \
                 "${S}" "${D}"usr/share \
         || die "Unable to copy files!"
 
         dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
         dosym ../lazarus/images/mainicon.xpm /usr/share/pixmaps/lazarus.xpm
 
         make_desktop_entry startlazarus "Lazarus IDE" "lazarus.xpm" || die "Failed making desktop entry!"
 }