Remove the workaround for bug #168168, and depend on a fixed librsvg

Package-Manager: portage-2.1.2.3

diff --git a/dev-lang/lazarus/ChangeLog b/dev-lang/lazarus/ChangeLog
index cf747c6c5b07cfbce95428902036a6a361dd6458..5376dd85141bf4453321dd227cb8cc6be8d7deac 100644 (file)
--- a/dev-lang/lazarus/ChangeLog
+++ b/dev-lang/lazarus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/lazarus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.14 2007/04/06 00:14:25 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.15 2007/04/06 19:03:58 truedfx Exp $
+
+*lazarus-0.9.22-r1 (06 Apr 2007)
+
+  06 Apr 2007; <harald@gentoo.org> -files/lazarus-iconcrash.patch,
+  -lazarus-0.9.22.ebuild, +lazarus-0.9.22-r1.ebuild:
+  Remove the workaround for bug #168168, and depend on a fixed librsvg
 
 *lazarus-0.9.22 (06 Apr 2007)
 

diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index 777dd8e5d03064793db50fbe28acdeb5ed6358c2..c8e04f0420f9f8173974e33d68a73521661fb916 100644 (file)
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -5,30 +5,26 @@ AUX lazarus-0.9.20-fpcsrc.patch 333 RMD160 2afa08d4a5e11c38dd3e6b6907c117b00c5b5
 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-iconcrash.patch 1067 RMD160 f8fa659473feb7f430891233f050fb988b5ab115 SHA1 72be01487a070b2a7f7e99167f1b3f82a4b680b3 SHA256 31effbccf131256d2795e66b984b574df10732b093c241dddab4391d63e3816a
-MD5 90d40593f7946a65083eccf75db4685f files/lazarus-iconcrash.patch 1067
-RMD160 f8fa659473feb7f430891233f050fb988b5ab115 files/lazarus-iconcrash.patch 1067
-SHA256 31effbccf131256d2795e66b984b574df10732b093c241dddab4391d63e3816a files/lazarus-iconcrash.patch 1067
 DIST lazarus-0.9.22-0.tar.gz 9264538 RMD160 cd78903b564b84f23a8f403a7324b616a23de116 SHA1 a150d387ac716f7ebd5697bd576c818c0f1a72b7 SHA256 9454e7383ad654fffba2adfc5749662dc3e5d4d7b064c25f8863260819b654f6
-EBUILD lazarus-0.9.22.ebuild 2406 RMD160 2f705671456884c486d547dfe375638fd74dc5ea SHA1 441498c620c835d286226e722aa5260c43af52ae SHA256 eb2f584b90cd05fddabc540ba3906c60578b98fb1221a214d1cdec66195910b7
-MD5 96b17f5a8c3069543e80bcabab66dba8 lazarus-0.9.22.ebuild 2406
-RMD160 2f705671456884c486d547dfe375638fd74dc5ea lazarus-0.9.22.ebuild 2406
-SHA256 eb2f584b90cd05fddabc540ba3906c60578b98fb1221a214d1cdec66195910b7 lazarus-0.9.22.ebuild 2406
-MISC ChangeLog 2595 RMD160 21b98983022c463fb9120c9b2262c77cccd44d43 SHA1 bea42e5a41ce0cf46683ad87b7a930c655f0855d SHA256 acd7a4ada23bcaa856d46dba1a740328f4f6446d8fcbf460d95eee04aa65f684
-MD5 504a1666b93436e7c38c6804e762f4ee ChangeLog 2595
-RMD160 21b98983022c463fb9120c9b2262c77cccd44d43 ChangeLog 2595
-SHA256 acd7a4ada23bcaa856d46dba1a740328f4f6446d8fcbf460d95eee04aa65f684 ChangeLog 2595
+EBUILD lazarus-0.9.22-r1.ebuild 2415 RMD160 9272faba6afc72a7fe4c9dd9aff5124d6e2bbf73 SHA1 a0244206fe98986f1d7987d4613f9373cd792a87 SHA256 c68ea15179d84011b9a1ff8ddc84faf40124312003216b223ce107782b14fed5
+MD5 3577fad302a0b3140ac99a246596a8a3 lazarus-0.9.22-r1.ebuild 2415
+RMD160 9272faba6afc72a7fe4c9dd9aff5124d6e2bbf73 lazarus-0.9.22-r1.ebuild 2415
+SHA256 c68ea15179d84011b9a1ff8ddc84faf40124312003216b223ce107782b14fed5 lazarus-0.9.22-r1.ebuild 2415
+MISC ChangeLog 2821 RMD160 2eb458a91c59cd043482cba975e5a68c6946edaa SHA1 0be4118fe87069845626dabbf19fba7dabe638e0 SHA256 b6e7e8e3ba2c9358d8e8e1ab7727380d5993384f0cecfbb0154a4d2da8b14c1d
+MD5 b13724be312fa59886afc93d9a153b7c ChangeLog 2821
+RMD160 2eb458a91c59cd043482cba975e5a68c6946edaa ChangeLog 2821
+SHA256 b6e7e8e3ba2c9358d8e8e1ab7727380d5993384f0cecfbb0154a4d2da8b14c1d ChangeLog 2821
 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 b8ec9a58f96778e8efa6b3900fe5aa16 files/digest-lazarus-0.9.22 253
-RMD160 e99948ba25430b60b23ea1df82dabe79596dd7ee files/digest-lazarus-0.9.22 253
-SHA256 90ab4e5bb33aabb6dbbba7cdeb12203576b4ba4227ad37b7dbb138137f975cb1 files/digest-lazarus-0.9.22 253
+MD5 b8ec9a58f96778e8efa6b3900fe5aa16 files/digest-lazarus-0.9.22-r1 253
+RMD160 e99948ba25430b60b23ea1df82dabe79596dd7ee files/digest-lazarus-0.9.22-r1 253
+SHA256 90ab4e5bb33aabb6dbbba7cdeb12203576b4ba4227ad37b7dbb138137f975cb1 files/digest-lazarus-0.9.22-r1 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGFZ0rwnQyISwouHwRApk4AJ44DOWLFw8mTM55q8G+bGz84guZlwCgq7D4
-t+1sAx7ddVg1/zDnaTrMgbQ=
-=+jeF
+iD8DBQFGFpnPwnQyISwouHwRAtXaAKCexZkFuCVqfQjQOXSjaLB6lDluHwCgslCk
+pJQ03JQJrJp0bOZ3u12cnyM=
+=0viZ
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/lazarus/files/digest-lazarus-0.9.22 b/dev-lang/lazarus/files/digest-lazarus-0.9.22-r1
similarity index 100%
rename from dev-lang/lazarus/files/digest-lazarus-0.9.22
rename to dev-lang/lazarus/files/digest-lazarus-0.9.22-r1

diff --git a/dev-lang/lazarus/files/lazarus-iconcrash.patch b/dev-lang/lazarus/files/lazarus-iconcrash.patch
deleted file mode 100644 (file)
index 4b7267e..0000000
--- a/dev-lang/lazarus/files/lazarus-iconcrash.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-This patch avoids a crash on amd64. It should be removed
-once the actual bug is fixed.
-
---- lazarus/lcl/interfaces/gtk2/gtk2object.inc
-+++ lazarus/lcl/interfaces/gtk2/gtk2object.inc
-@@ -491,6 +491,7 @@
-   StockName : PChar;
-   IconSet : PGtkIconSet;
-   Pixbuf : PGDKPixbuf;
-+  Style : TLazGtkStyle;
- begin
-   Case StockID Of
-     idButtonOk : StockName := GTK_STOCK_OK;
-@@ -522,9 +523,11 @@
-   end;
- 
-   if (StockID >= idButtonBase) and (StockID <= idDialogBase) then
--    pixbuf := gtk_icon_set_render_icon(IconSet, GetStyle(lgsbutton), GTK_TEXT_DIR_NONE, GTK_STATE_NORMAL, GTK_ICON_SIZE_BUTTON, GetStyleWidget(lgsbutton), nil)
-+    Style := lgsbutton
-   else
--    pixbuf := gtk_icon_set_render_icon(IconSet, GetStyle(lgswindow), GTK_TEXT_DIR_NONE, GTK_STATE_NORMAL, GTK_ICON_SIZE_DIALOG, GetStyleWidget(lgswindow), nil);
-+    Style := lgswindow;
-+
-+  pixbuf := gtk_icon_set_render_icon(IconSet, GetStyle(Style), GTK_TEXT_DIR_NONE, GTK_STATE_NORMAL, GTK_ICON_SIZE_BUTTON, GetStyleWidget(Style), nil);
- 
-   Pixmap := NewGDIObject(gdiBitmap);
-   With Pixmap^ do begin

diff --git a/dev-lang/lazarus/lazarus-0.9.22.ebuild b/dev-lang/lazarus/lazarus-0.9.22-r1.ebuild
similarity index 95%
rename from dev-lang/lazarus/lazarus-0.9.22.ebuild
rename to dev-lang/lazarus/lazarus-0.9.22-r1.ebuild
index 9bc0f95886e7c98b27892774847200444cf0770f..035f10ba53f04ec7fe82daf4fb0bd189b682cabb 100644 (file)
--- a/dev-lang/lazarus/lazarus-0.9.22.ebuild
+++ b/dev-lang/lazarus/lazarus-0.9.22-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.22.ebuild,v 1.1 2007/04/06 00:14:25 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.22-r1.ebuild,v 1.1 2007/04/06 19:03:58 truedfx Exp $
 
 inherit eutils
 
@@ -17,6 +17,8 @@ SRC_URI="mirror://sourceforge/lazarus/${P}-0.tar.gz"
 DEPEND="~dev-lang/fpc-${FPCVER}
        net-misc/rsync
        >=x11-libs/gtk+-2.0"
+RDEPEND="${RDEPEND}
+       !=gnome-base/librsvg-2.16.1"
 
 S=${WORKDIR}/${PN}
 
@@ -45,7 +47,6 @@ src_unpack() {
 
        cd "${S}"
        epatch "${T}"/fpcsrc.patch
-       epatch "${FILESDIR}"/${PN}-iconcrash.patch
 }
 
 src_compile() {