From 3f0147bce4470ebaf2522c47739141d0c7c89636 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Thu, 4 Jan 2007 19:45:32 +0000 Subject: [PATCH] Remove gnuconfig update and fix autotools handling. Package-Manager: portage-2.1.2_rc4-r5 --- x11-themes/wm-icons/ChangeLog | 8 +++- x11-themes/wm-icons/Manifest | 46 ++++++++++++------- x11-themes/wm-icons/wm-icons-0.3.0.ebuild | 9 ++-- .../wm-icons/wm-icons-0.4.0_pre1-r1.ebuild | 22 ++++----- .../wm-icons/wm-icons-0.4.0_pre1.ebuild | 7 +-- 5 files changed, 51 insertions(+), 41 deletions(-) diff --git a/x11-themes/wm-icons/ChangeLog b/x11-themes/wm-icons/ChangeLog index eb037533b0bb..ed623953b639 100644 --- a/x11-themes/wm-icons/ChangeLog +++ b/x11-themes/wm-icons/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-themes/wm-icons -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/wm-icons/ChangeLog,v 1.16 2006/07/08 08:44:11 corsair Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-themes/wm-icons/ChangeLog,v 1.17 2007/01/04 19:45:32 flameeyes Exp $ + + 04 Jan 2007; Diego Pettenò wm-icons-0.3.0.ebuild, + wm-icons-0.4.0_pre1.ebuild, wm-icons-0.4.0_pre1-r1.ebuild: + Remove gnuconfig update and fix autotools handling. 08 Jul 2006; Markus Rothe wm-icons-0.4.0_pre1-r1.ebuild: diff --git a/x11-themes/wm-icons/Manifest b/x11-themes/wm-icons/Manifest index 9d15ca7d06c8..40f136592522 100644 --- a/x11-themes/wm-icons/Manifest +++ b/x11-themes/wm-icons/Manifest @@ -1,21 +1,28 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST wm-icons-0.3.0.tar.bz2 979087 RMD160 c71d4c30c02604fc33065cf18c948d5e3a964aac SHA1 f7afdc0bd4acf3a9657d5bd7f06834361c85bd43 SHA256 a65b3a3062c1f090100a38d80cade66fd5f483cfe59ef210ad50727a6064d5d2 DIST wm-icons-0.4.0_pre1-cvs-01092003.tar.bz2 2046784 RMD160 eda3235a35123a82e89c1a982bb669ca872daf05 SHA1 05f5b58614e38a86024aa8c049cfffdf3fb15049 SHA256 c544fa910944cfe1f380750dabce83012b52f68c5c72cfa73ac529b8b720c715 -EBUILD wm-icons-0.3.0.ebuild 1504 RMD160 63c9ce235a94df7b1a3f27063988b5464d16f6f2 SHA1 ab1e492bb95178903eb99c7715987fde607fbbbc SHA256 943a74e6b2185b0f7dd98774d188e9ea7e497ce23d0698f9659fff2fee6c9b2f -MD5 d983d0f047d6c62c32c864ad1e190758 wm-icons-0.3.0.ebuild 1504 -RMD160 63c9ce235a94df7b1a3f27063988b5464d16f6f2 wm-icons-0.3.0.ebuild 1504 -SHA256 943a74e6b2185b0f7dd98774d188e9ea7e497ce23d0698f9659fff2fee6c9b2f wm-icons-0.3.0.ebuild 1504 -EBUILD wm-icons-0.4.0_pre1-r1.ebuild 1876 RMD160 12b44f806f22aa4121324699bb1585c5fd280920 SHA1 9f955af134122d25ad344cc7142ec2c90bca95b7 SHA256 d5ca3c61b39d149d2d319e69635a1a2a3088cce7b58c8fc771142ad779434892 -MD5 4677d541c823572af1b07fd7ba076810 wm-icons-0.4.0_pre1-r1.ebuild 1876 -RMD160 12b44f806f22aa4121324699bb1585c5fd280920 wm-icons-0.4.0_pre1-r1.ebuild 1876 -SHA256 d5ca3c61b39d149d2d319e69635a1a2a3088cce7b58c8fc771142ad779434892 wm-icons-0.4.0_pre1-r1.ebuild 1876 -EBUILD wm-icons-0.4.0_pre1.ebuild 1707 RMD160 5889837b75d49de24267d95937023e9806a9d83f SHA1 f284b44939084cc6805627b4abfabff9587757a3 SHA256 d255a063a914ce917557a886eafcc2b10d5efeb9122dbc017c859e586d17c38f -MD5 8028cbfe57647731b322296d607c717f wm-icons-0.4.0_pre1.ebuild 1707 -RMD160 5889837b75d49de24267d95937023e9806a9d83f wm-icons-0.4.0_pre1.ebuild 1707 -SHA256 d255a063a914ce917557a886eafcc2b10d5efeb9122dbc017c859e586d17c38f wm-icons-0.4.0_pre1.ebuild 1707 -MISC ChangeLog 1874 RMD160 898714421844b3b5b67c645eb437bc8e5b6c2332 SHA1 f6d39c6c8575fdeff53ea2fd6deb7e7967abb4d0 SHA256 547147408a96f191aef95f64817c12ef251577fbf3e4ded8f53f88a65517db70 -MD5 9d8bf232e8f28bc09a770fa6b6b9ba8d ChangeLog 1874 -RMD160 898714421844b3b5b67c645eb437bc8e5b6c2332 ChangeLog 1874 -SHA256 547147408a96f191aef95f64817c12ef251577fbf3e4ded8f53f88a65517db70 ChangeLog 1874 +EBUILD wm-icons-0.3.0.ebuild 1491 RMD160 96be47f219bd1a0198a6de99032547967c204052 SHA1 8911bf268b4e3799f27d4b24649eb5b1ae576a0c SHA256 f66087b4078e9ecf35dacb6eecf2ba6663360e09a336c292cc999165f3e71dfd +MD5 db66186419d21323c0d270307797b412 wm-icons-0.3.0.ebuild 1491 +RMD160 96be47f219bd1a0198a6de99032547967c204052 wm-icons-0.3.0.ebuild 1491 +SHA256 f66087b4078e9ecf35dacb6eecf2ba6663360e09a336c292cc999165f3e71dfd wm-icons-0.3.0.ebuild 1491 +EBUILD wm-icons-0.4.0_pre1-r1.ebuild 1814 RMD160 1c73aadebbb548f8717f2fc22f519190ffce1749 SHA1 845f0ff0087004c573c13d6bf4990b6d519ff8f5 SHA256 e2e5eceecb78f9e83d78ae72c7a84f4b0226107154ec87e87a4159dc0961691f +MD5 46b81db178c5d5085cd2ec8d31f107cd wm-icons-0.4.0_pre1-r1.ebuild 1814 +RMD160 1c73aadebbb548f8717f2fc22f519190ffce1749 wm-icons-0.4.0_pre1-r1.ebuild 1814 +SHA256 e2e5eceecb78f9e83d78ae72c7a84f4b0226107154ec87e87a4159dc0961691f wm-icons-0.4.0_pre1-r1.ebuild 1814 +EBUILD wm-icons-0.4.0_pre1.ebuild 1673 RMD160 8fb4d370d415c756eb16cfc77fa7752963caef1d SHA1 3f04c062f4f1f0cd07e40b3802280095c3558255 SHA256 3b0e7a6fa882cf5a7902a2dd4754970fb5182cd1cee6114f1cd19a36fcda7d27 +MD5 dd8fb05ec422aa45c77618e24c97130f wm-icons-0.4.0_pre1.ebuild 1673 +RMD160 8fb4d370d415c756eb16cfc77fa7752963caef1d wm-icons-0.4.0_pre1.ebuild 1673 +SHA256 3b0e7a6fa882cf5a7902a2dd4754970fb5182cd1cee6114f1cd19a36fcda7d27 wm-icons-0.4.0_pre1.ebuild 1673 +MISC #wm-icons-0.4.0_pre1.ebuild# 1670 RMD160 132d8d31be4866943f5188619436dddd528ac1d5 SHA1 43fa61d3e40d734a9870f418d2cb1e4594599e11 SHA256 73e20cf9119114bd6e5bf30309b3da8509fee4f71b7f5920d1a910e4e1b87857 +MD5 2a583b0c8d5d3403ccc6062f3346937a #wm-icons-0.4.0_pre1.ebuild# 1670 +RMD160 132d8d31be4866943f5188619436dddd528ac1d5 #wm-icons-0.4.0_pre1.ebuild# 1670 +SHA256 73e20cf9119114bd6e5bf30309b3da8509fee4f71b7f5920d1a910e4e1b87857 #wm-icons-0.4.0_pre1.ebuild# 1670 +MISC ChangeLog 2068 RMD160 0371153e0163c829dd7d9f6a0e80ef12bc9cf1b1 SHA1 6c669dad8939875606792672b618da443319a0e1 SHA256 9e964dd04e3f9be3bfa83ee822c4290a6ca67daecd033499941fcc807f9a6f8d +MD5 a7d66e36a99b4f8480b5ce7e2e634979 ChangeLog 2068 +RMD160 0371153e0163c829dd7d9f6a0e80ef12bc9cf1b1 ChangeLog 2068 +SHA256 9e964dd04e3f9be3bfa83ee822c4290a6ca67daecd033499941fcc807f9a6f8d ChangeLog 2068 MISC metadata.xml 343 RMD160 102673ccb1de89a7b619c0f331fdb4207fe17f21 SHA1 807371066e6e747e18109ab10d3252de0a3ccdc6 SHA256 7bbbb2ca0739f15d5a9ee7304c02e4acc76c1b67731eda1a167281d513be4196 MD5 593dade37b68bfce0efec196ddbc955c metadata.xml 343 RMD160 102673ccb1de89a7b619c0f331fdb4207fe17f21 metadata.xml 343 @@ -29,3 +36,10 @@ SHA256 565ad12a10e68ddc05cacfedf7f721639069e5364a88a2ce65fd3d757a524387 files/di MD5 e7124b8d1a3237bc2cad00318c51e255 files/digest-wm-icons-0.4.0_pre1-r1 304 RMD160 ace1c145da57b81c9ebc0304e05c0fb41c519bd6 files/digest-wm-icons-0.4.0_pre1-r1 304 SHA256 565ad12a10e68ddc05cacfedf7f721639069e5364a88a2ce65fd3d757a524387 files/digest-wm-icons-0.4.0_pre1-r1 304 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.1 (GNU/Linux) + +iD8DBQFFnVljAiZjviIA2XgRAgH6AJ0ZOJor6j/Z/uYGmlthr7j8h+S52ACfSrWR +yt5dZrXtpsh0H15IHhs3HxQ= +=UtcT +-----END PGP SIGNATURE----- diff --git a/x11-themes/wm-icons/wm-icons-0.3.0.ebuild b/x11-themes/wm-icons/wm-icons-0.3.0.ebuild index ac2044a6e7fd..af6dd4bda946 100644 --- a/x11-themes/wm-icons/wm-icons-0.3.0.ebuild +++ b/x11-themes/wm-icons/wm-icons-0.3.0.ebuild @@ -1,8 +1,6 @@ -# 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/wm-icons/wm-icons-0.3.0.ebuild,v 1.10 2006/05/19 18:06:55 corsair Exp $ - -inherit gnuconfig +# $Header: /var/cvsroot/gentoo-x86/x11-themes/wm-icons/wm-icons-0.3.0.ebuild,v 1.11 2007/01/04 19:45:32 flameeyes Exp $ DESCRIPTION="A Large Assortment of Beutiful Themed Icons, Created with FVWM in mind" @@ -22,12 +20,11 @@ RDEPEND="${DEPEND}" src_unpack() { unpack ${A} sed -i 's#$(bindir)/wm-icons-config#true#g' ${S}/Makefile.in - gnuconfig_update } src_compile() { econf --enable-all-sets --enable-icondir=/usr/share/icons/wm-icons || die "econf failed" - emake + emake || die "emake failed" } src_install() { diff --git a/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild b/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild index 60bddee9f80c..339005edba84 100644 --- a/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild +++ b/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.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/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild,v 1.11 2006/07/08 08:44:11 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/wm-icons/wm-icons-0.4.0_pre1-r1.ebuild,v 1.12 2007/01/04 19:45:32 flameeyes Exp $ -inherit gnuconfig +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" + +inherit autotools DESCRIPTION="A Large Assortment of Beutiful Themed Icons, Created with FVWM in mind" @@ -27,19 +30,14 @@ src_unpack() { sed -i '132s/bin\/Makefile//' ${S}/configure.in # non-portable comment bombs automake. sed -i 's/\t#/#/' ${S}/Makefile.am - gnuconfig_update + + cd "${S}" + eautoreconf } src_compile() { - ebegin "Generating configure script, Please wait..." - ( aclocal - autoheader - automake --add-missing - autoreconf ) 2>/dev/null - eend $? - econf --enable-all-sets --enable-icondir=/usr/share/icons/wm-icons || die "econf failed" - emake + emake || die "emake failed" } src_install() { diff --git a/x11-themes/wm-icons/wm-icons-0.4.0_pre1.ebuild b/x11-themes/wm-icons/wm-icons-0.4.0_pre1.ebuild index 396feb41f3e2..6df33ae5f141 100644 --- a/x11-themes/wm-icons/wm-icons-0.4.0_pre1.ebuild +++ b/x11-themes/wm-icons/wm-icons-0.4.0_pre1.ebuild @@ -1,8 +1,6 @@ -# 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/wm-icons/wm-icons-0.4.0_pre1.ebuild,v 1.9 2006/05/19 18:06:55 corsair Exp $ - -inherit gnuconfig +# $Header: /var/cvsroot/gentoo-x86/x11-themes/wm-icons/wm-icons-0.4.0_pre1.ebuild,v 1.10 2007/01/04 19:45:32 flameeyes Exp $ DESCRIPTION="A Large Assortment of Beutiful Themed Icons, Created with FVWM in mind" @@ -27,7 +25,6 @@ src_unpack() { unpack ${A} sed -i 's#$(bindir)/wm-icons-config#true#g' ${S}/Makefile.am - gnuconfig_update } src_compile() { -- 2.26.2