From: Diego Elio Pettenò Date: Thu, 4 Jan 2007 12:56:16 +0000 (+0000) Subject: Fix autotools rebuilding handling and add missing dependency over intltool. Patch... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8b601ec43371f6aaf135dd03630da76fa1d3f314;p=gentoo.git Fix autotools rebuilding handling and add missing dependency over intltool. Patch mostly based on the one by Jakub Moc in bug #150272. Package-Manager: portage-2.1.2_rc4-r5 --- diff --git a/x11-themes/ximian-artwork/ChangeLog b/x11-themes/ximian-artwork/ChangeLog index b32992e0d7e3..0699bb9a185e 100644 --- a/x11-themes/ximian-artwork/ChangeLog +++ b/x11-themes/ximian-artwork/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-themes/ximian-artwork -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ChangeLog,v 1.27 2006/11/13 14:48:59 flameeyes Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ChangeLog,v 1.28 2007/01/04 12:56:16 flameeyes Exp $ + + 04 Jan 2007; Diego Pettenò + ximian-artwork-0.2.32.1.ebuild: + Fix autotools rebuilding handling and add missing dependency over intltool. + Patch mostly based on the one by Jakub Moc in bug #150272. 13 Nov 2006; Diego Pettenò ximian-artwork-0.2.29.0.6.3.ebuild, ximian-artwork-0.2.32.1.ebuild: diff --git a/x11-themes/ximian-artwork/Manifest b/x11-themes/ximian-artwork/Manifest index c33171af06cf..b7d6a8b12b87 100644 --- a/x11-themes/ximian-artwork/Manifest +++ b/x11-themes/ximian-artwork/Manifest @@ -23,14 +23,14 @@ EBUILD ximian-artwork-0.2.29.0.6.3.ebuild 1978 RMD160 7cbbcc24b8b2e2f00a91da6ea6 MD5 da4ef2cfee15b650827fc41ce8d9cd02 ximian-artwork-0.2.29.0.6.3.ebuild 1978 RMD160 7cbbcc24b8b2e2f00a91da6ea6662d1227140031 ximian-artwork-0.2.29.0.6.3.ebuild 1978 SHA256 c414b2c28523ca70ae73a317ff6788e1d34317e5b439fe395e69a2f928a4c5a7 ximian-artwork-0.2.29.0.6.3.ebuild 1978 -EBUILD ximian-artwork-0.2.32.1.ebuild 1944 RMD160 e0c8667dd8159a26b2310645f2920aaa9d122d8b SHA1 2355d2e83c8c315e1aee0a70782683854d3992dd SHA256 200b66e18ecb04a0c34938f519f086d63c11defae2d26633826b55a7aeee4f23 -MD5 effee2da1f8165694801ac95a49766d4 ximian-artwork-0.2.32.1.ebuild 1944 -RMD160 e0c8667dd8159a26b2310645f2920aaa9d122d8b ximian-artwork-0.2.32.1.ebuild 1944 -SHA256 200b66e18ecb04a0c34938f519f086d63c11defae2d26633826b55a7aeee4f23 ximian-artwork-0.2.32.1.ebuild 1944 -MISC ChangeLog 4155 RMD160 7882f050e85a70272436168e474db8195111ba97 SHA1 638e595ceae4c83cf90ad9b9bbe98e64b84c7c78 SHA256 24e1ef72204076a9af174ff6c741a831463fe32156f4f4ac13782adeae222920 -MD5 2dab1a01a28b18d4e1b188caaf26627e ChangeLog 4155 -RMD160 7882f050e85a70272436168e474db8195111ba97 ChangeLog 4155 -SHA256 24e1ef72204076a9af174ff6c741a831463fe32156f4f4ac13782adeae222920 ChangeLog 4155 +EBUILD ximian-artwork-0.2.32.1.ebuild 1734 RMD160 db85690a3dbc7577125d214dbfc68fd93fa7cc8b SHA1 c87eb28c69ded6e4ccee11e85611a57badaae5ce SHA256 0ecb0ae0a07cf43ca5f30aab420385feef82f2915f623b80cb6320818c5c1038 +MD5 1bfd35364f2e59370415dec83fcb7b98 ximian-artwork-0.2.32.1.ebuild 1734 +RMD160 db85690a3dbc7577125d214dbfc68fd93fa7cc8b ximian-artwork-0.2.32.1.ebuild 1734 +SHA256 0ecb0ae0a07cf43ca5f30aab420385feef82f2915f623b80cb6320818c5c1038 ximian-artwork-0.2.32.1.ebuild 1734 +MISC ChangeLog 4382 RMD160 cb6c179e87340bef6c9e9f2e116316bcecdf415c SHA1 b8d5580162c837c8e5819ca8946e155984a7e09b SHA256 5a2f146f48a689add79c03719176ff11b02c5cd4246561e30f295b9edab051c6 +MD5 360f8cac615e82580fe3bb0077b51224 ChangeLog 4382 +RMD160 cb6c179e87340bef6c9e9f2e116316bcecdf415c ChangeLog 4382 +SHA256 5a2f146f48a689add79c03719176ff11b02c5cd4246561e30f295b9edab051c6 ChangeLog 4382 MISC metadata.xml 219 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 SHA1 aad05fa7d0ab2c9304502d4843d10f775afad2a8 SHA256 f39a99f0777bf9eac2d5a444a392d3b93da834a6de01613747bad25c84637138 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 metadata.xml 219 @@ -42,9 +42,9 @@ MD5 f9969c019aa4a21e476f82f4a972afc3 files/digest-ximian-artwork-0.2.32.1 286 RMD160 4d7c68cacfeb8a6c4ff65821da19102b3237a2c0 files/digest-ximian-artwork-0.2.32.1 286 SHA256 00059478c2964f401e47c5fb0ad87902cc06c7b6f19c430d9446ad78cf175b4e files/digest-ximian-artwork-0.2.32.1 286 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFWIXiAiZjviIA2XgRAtnsAKC0Be3CXzOKpm9yeCW0bb7bizI/WACgk959 -ykNERuPW0HgSuaJCDFpV9/A= -=RUym +iD8DBQFFnPl3AiZjviIA2XgRAu9SAJ9Spst/vFZ8006kIEbQjbf5gnR4jwCgs4Oo +x8VpcriM2zGF/cjwe81zcAc= +=qzuE -----END PGP SIGNATURE----- diff --git a/x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild b/x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild index a6d244cf07b5..8b957e1398d0 100644 --- a/x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild +++ b/x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild @@ -1,8 +1,11 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild,v 1.5 2006/11/13 14:48:59 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild,v 1.6 2007/01/04 12:56:16 flameeyes Exp $ -inherit rpm eutils versionator +WANT_AUTOMAKE="latest" +WANT_AUTOCONF="latest" + +inherit rpm eutils versionator autotools # bash magic to extract last 2 versions as XIMIAN_V, # third last version as RPM_V and the rest as MY_PV @@ -17,10 +20,8 @@ SLOT="0" KEYWORDS="~amd64 ppc sparc ~x86" IUSE="" -DEPEND="sys-devel/autoconf - sys-devel/automake - app-arch/rpm2targz" - +DEPEND="app-arch/rpm2targz + dev-util/intltool" RDEPEND=">=x11-themes/gnome-themes-extras-0.5" @@ -28,40 +29,29 @@ S="${WORKDIR}/${PN}-${MY_PV}" src_unpack() { rpm_src_unpack - cd ${S} - epatch ${FILESDIR}/${P}-disable_industrial_engine.patch -} + cd "${S}" + epatch "${FILESDIR}/${P}-disable_industrial_engine.patch" -src_compile() { - aclocal && autoconf && automake || die - libtoolize --copy --force - econf || die - emake || die + eautoreconf } src_install () { - make DESTDIR=${D} install || die + emake DESTDIR="${D}" install || die "emake install failed" # Removing trademarks - patch ${D}/usr/share/gdm/themes/industrial/industrial.xml < ${FILESDIR}/${PN}-0.2.26-gdm.patch || die "patch failed" - rm -f ${D}/usr/share/gdm/themes/industrial/xd2logo.png - rm -rf ${D}/usr/share/pixmaps/ximian - rm -f ${D}/usr/share/pixmaps/ximian-desktop-stripe.png + patch "${D}"/usr/share/gdm/themes/industrial/industrial.xml < ${FILESDIR}/${PN}-0.2.26-gdm.patch || die "patch failed" + rm -f "${D}"/usr/share/gdm/themes/industrial/xd2logo.png + rm -rf "${D}"/usr/share/pixmaps/ximian + rm -f "${D}"/usr/share/pixmaps/ximian-desktop-stripe.png # Set up X11 implementation - #X11_IMPLEM_P="$(best_version virtual/x11)" - #X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" - #X11_IMPLEM="${X11_IMPLEM##*\/}" X11_IMPLEM="xorg-x11" - einfo "X11 implementation is ${X11_IMPLEM}." - - # Moving cursors dodir /usr/share/cursors/${X11_IMPLEM}/Industrial - mv ${D}/usr/share/icons/Industrial/cursors ${D}/usr/share/cursors/${X11_IMPLEM}/Industrial + mv "${D}"/usr/share/icons/Industrial/cursors "${D}"/usr/share/cursors/${X11_IMPLEM}/Industrial # remove xmms skin if unneeded - rm -rf ${D}/usr/share/xmms + rm -rf "${D}"/usr/share/xmms - cd ${S} - dodoc COPYING ChangeLog + cd "${S}" + dodoc ChangeLog }