From 79007b1689b476c91dc6c40f8d3c112775826367 Mon Sep 17 00:00:00 2001 From: Matsuu Takuto Date: Thu, 22 Mar 2007 15:16:07 +0000 Subject: [PATCH] Fixed dependency, bug #171597. Package-Manager: portage-2.1.2.2 --- app-dicts/stardict/ChangeLog | 6 +++- app-dicts/stardict/Manifest | 34 ++++++++------------- app-dicts/stardict/stardict-2.4.6-r1.ebuild | 3 +- app-dicts/stardict/stardict-2.4.8.ebuild | 9 +++--- 4 files changed, 24 insertions(+), 28 deletions(-) diff --git a/app-dicts/stardict/ChangeLog b/app-dicts/stardict/ChangeLog index 468f3bf09548..42a50fc8ec20 100644 --- a/app-dicts/stardict/ChangeLog +++ b/app-dicts/stardict/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-dicts/stardict # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/ChangeLog,v 1.32 2007/01/25 04:53:02 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/ChangeLog,v 1.33 2007/03/22 15:16:07 matsuu Exp $ + + 22 Mar 2007; MATSUU Takuto stardict-2.4.6-r1.ebuild, + stardict-2.4.8.ebuild: + Fixed dependency, bug #171597 25 Jan 2007; Marius Mauch stardict-2.4.2.ebuild, stardict-2.4.6-r1.ebuild, stardict-2.4.8.ebuild: diff --git a/app-dicts/stardict/Manifest b/app-dicts/stardict/Manifest index c33f4fcf9209..ca38d0c7d54d 100644 --- a/app-dicts/stardict/Manifest +++ b/app-dicts/stardict/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX stardict-config.sh 565 RMD160 6a2597434a981fc94a9296fa94dbc0ea000f557a SHA1 4e94d27b4af25c68c954d542a0712f6edb55f4f3 SHA256 f10c81a567100201cbef3f690042c191e499a4f862946e3e134eca9991d715f0 MD5 b41107d5daeb5414fa21b3f9905e105c files/stardict-config.sh 565 RMD160 6a2597434a981fc94a9296fa94dbc0ea000f557a files/stardict-config.sh 565 @@ -20,18 +17,18 @@ EBUILD stardict-2.4.2.ebuild 1768 RMD160 98c236c6935b97ca9ffa8a9367016d0382ec10c MD5 06a8d38453cb9ac1c9b860559d72c705 stardict-2.4.2.ebuild 1768 RMD160 98c236c6935b97ca9ffa8a9367016d0382ec10cf stardict-2.4.2.ebuild 1768 SHA256 ba04924580f23391c7f27e101aba2ec54c833106906409471470a35daee709e8 stardict-2.4.2.ebuild 1768 -EBUILD stardict-2.4.6-r1.ebuild 1810 RMD160 c1a57f72016da733e81a657d1d257a406de1bd5b SHA1 aa647a35fa08e5f26b6a1c212cdd9de55d3c4888 SHA256 7616485d77a4fd59a7ba82675bc4d7953310fb7554a84200a5543a14beafca18 -MD5 f087e18cff8d8e51d489febdedaf6910 stardict-2.4.6-r1.ebuild 1810 -RMD160 c1a57f72016da733e81a657d1d257a406de1bd5b stardict-2.4.6-r1.ebuild 1810 -SHA256 7616485d77a4fd59a7ba82675bc4d7953310fb7554a84200a5543a14beafca18 stardict-2.4.6-r1.ebuild 1810 -EBUILD stardict-2.4.8.ebuild 1849 RMD160 61cf93ffa4615b191b12b33c0cffafd643385892 SHA1 607690dce568a56750c0d56273c2e60b6b48bd7d SHA256 e2032dfd61f5ac2efc3e3115b5ff17f79d431df1188c08dc863969b20d29c676 -MD5 37b6d4a91f901759a7a22c6db71be4ff stardict-2.4.8.ebuild 1849 -RMD160 61cf93ffa4615b191b12b33c0cffafd643385892 stardict-2.4.8.ebuild 1849 -SHA256 e2032dfd61f5ac2efc3e3115b5ff17f79d431df1188c08dc863969b20d29c676 stardict-2.4.8.ebuild 1849 -MISC ChangeLog 4860 RMD160 9963929eda3fe7286470338e441439ea30f91b57 SHA1 d9f64c64c334b61d9be26b38944cd7ef595ec2ac SHA256 a7a6ed70f79f24c9ab0db07c7c45b9395857ca4d4eebf5baeaaaca30f6693004 -MD5 8ed832aa082d78fbe40dd28e9288a3aa ChangeLog 4860 -RMD160 9963929eda3fe7286470338e441439ea30f91b57 ChangeLog 4860 -SHA256 a7a6ed70f79f24c9ab0db07c7c45b9395857ca4d4eebf5baeaaaca30f6693004 ChangeLog 4860 +EBUILD stardict-2.4.6-r1.ebuild 1836 RMD160 cec9d1353d641035478a3070ccede9c75242a835 SHA1 1da03ba256d69752c5632f74bb31e8e23795f186 SHA256 929b75e09763ee2ab720ff99d892b0570d6092b1eb01012954a5242acc6bcd21 +MD5 5d8f404e50fdd2f418a3941b37613113 stardict-2.4.6-r1.ebuild 1836 +RMD160 cec9d1353d641035478a3070ccede9c75242a835 stardict-2.4.6-r1.ebuild 1836 +SHA256 929b75e09763ee2ab720ff99d892b0570d6092b1eb01012954a5242acc6bcd21 stardict-2.4.6-r1.ebuild 1836 +EBUILD stardict-2.4.8.ebuild 1878 RMD160 0cc7e535790d4a1d36008bf9d9b6c6d2d68de442 SHA1 3ac33fb982b4ca7c32744c6438c251f0c4e9ad37 SHA256 fd3d626ea0f85ed0c7e7d1abf5d2011f17693e2a9e7a8bb6e45c730e9e8d7be5 +MD5 9e4eecb5e40f321c49297a21d46887fe stardict-2.4.8.ebuild 1878 +RMD160 0cc7e535790d4a1d36008bf9d9b6c6d2d68de442 stardict-2.4.8.ebuild 1878 +SHA256 fd3d626ea0f85ed0c7e7d1abf5d2011f17693e2a9e7a8bb6e45c730e9e8d7be5 stardict-2.4.8.ebuild 1878 +MISC ChangeLog 4993 RMD160 cf472c86a866b1693509a80e421f26f771ee4336 SHA1 6da960ae538fbc469aae373ae5371c2cb4851da2 SHA256 c8a437454e0cf53efc6ba562ba85bd94c44524125a6fe7fd5d4a0b6013caf974 +MD5 1dee340dd761c1ca86d7d14157e14b7d ChangeLog 4993 +RMD160 cf472c86a866b1693509a80e421f26f771ee4336 ChangeLog 4993 +SHA256 c8a437454e0cf53efc6ba562ba85bd94c44524125a6fe7fd5d4a0b6013caf974 ChangeLog 4993 MISC metadata.xml 215 RMD160 bc605cad3a51cfe131aebf045a65a7152dc1c970 SHA1 04148868215a4ce703bb598daed1a7372b437b1f SHA256 ea8096d4344ae593281549545469191c76ecd503f708ab04c2027095b59fa234 MD5 b1119d84c7a4c3535572b94ec508e907 metadata.xml 215 RMD160 bc605cad3a51cfe131aebf045a65a7152dc1c970 metadata.xml 215 @@ -45,10 +42,3 @@ SHA256 7e514ceb158d58e105e2d34aaa47e55620257ae9dda250d8329ba21b221e1c22 files/di MD5 921f910c41813a50bb942cbe82622c65 files/digest-stardict-2.4.8 250 RMD160 138e30213385b678d4281faee7152c0b3aab9ee1 files/digest-stardict-2.4.8 250 SHA256 dc3d67a59a857aadcfc1be6648c386821ad2f3b58534b01f462fbf7bdba74309 files/digest-stardict-2.4.8 250 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFFuDpV6J2i8a8J4okRAgtbAJ9YGL114JWpBYKY0g+tzVoVlufrvQCfaTgq -MIxs0I+w3Z/j3B5auyF+G9o= -=Zd5b ------END PGP SIGNATURE----- diff --git a/app-dicts/stardict/stardict-2.4.6-r1.ebuild b/app-dicts/stardict/stardict-2.4.6-r1.ebuild index a1e53799e2d9..3ee8baea2f72 100644 --- a/app-dicts/stardict/stardict-2.4.6-r1.ebuild +++ b/app-dicts/stardict/stardict-2.4.6-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/app-dicts/stardict/stardict-2.4.6-r1.ebuild,v 1.7 2007/01/25 04:53:02 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-2.4.6-r1.ebuild,v 1.8 2007/03/22 15:16:07 matsuu Exp $ inherit gnome2 eutils @@ -31,6 +31,7 @@ RDEPEND="gnome? ( >=gnome-base/libbonobo-2.2.0 >=x11-libs/gtk+-2" DEPEND="${RDEPEND} + >=dev-util/intltool-0.22 dev-util/pkgconfig" src_unpack() { diff --git a/app-dicts/stardict/stardict-2.4.8.ebuild b/app-dicts/stardict/stardict-2.4.8.ebuild index acce91cbc710..67128bd0a2f9 100644 --- a/app-dicts/stardict/stardict-2.4.8.ebuild +++ b/app-dicts/stardict/stardict-2.4.8.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/app-dicts/stardict/stardict-2.4.8.ebuild,v 1.2 2007/01/25 04:53:02 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-2.4.8.ebuild,v 1.3 2007/03/22 15:16:07 matsuu Exp $ inherit gnome2 eutils @@ -23,14 +23,15 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" RDEPEND="gnome? ( >=gnome-base/libbonobo-2.2.0 >=gnome-base/libgnome-2.2.0 >=gnome-base/libgnomeui-2.2.0 - >=gnome-base/gconf-1.2 + >=gnome-base/gconf-2 >=gnome-base/orbit-2.6 app-text/scrollkeeper ) >=sys-libs/zlib-1.1.4 >=dev-libs/popt-1.7 - >=x11-libs/gtk+-2" + >=x11-libs/gtk+-2.6" DEPEND="${RDEPEND} + >=dev-util/intltool-0.22 dev-util/pkgconfig" src_unpack() { @@ -39,7 +40,7 @@ src_unpack() { } src_compile() { - export PKG_CONFIG=`which pkg-config` + export PKG_CONFIG=$(type -P pkg-config) G2CONF="$(use_enable gnome gnome-support)" gnome2_src_compile } -- 2.26.2