diff options
| author |   Tavis Ormandy <taviso@gentoo.org> | 2004-03-25 19:14:15 +0000 |
|---|---|---|
| committer | Tavis Ormandy <taviso@gentoo.org> | 2004-03-25 19:14:15 +0000 |
| commit | 30b11381054a73022d06ec85430b60be46c8bfda (patch) | |
| tree | b7a19c90a0123b69a99aa0fe6b5e125f9e06860c /x11-themes | |
| parent | modified ebuild to inherit gnuconfig and run gnuconfig_update, unmasked on ~a... (diff) | |
| download | historical-30b11381054a73022d06ec85430b60be46c8bfda.tar.gz historical-30b11381054a73022d06ec85430b60be46c8bfda.tar.bz2 historical-30b11381054a73022d06ec85430b60be46c8bfda.zip | |
fixing configure check
Diffstat (limited to 'x11-themes')
| -rw-r--r-- | x11-themes/fvwm-crystal/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-themes/fvwm-crystal/Manifest | 5 | ||||
| -rw-r--r-- | x11-themes/fvwm-crystal/files/fvwm-crystal-fvwm-version-check.diff | 12 | ||||
| -rw-r--r-- | x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild | 20 |
4 files changed, 36 insertions, 7 deletions
diff --git a/x11-themes/fvwm-crystal/ChangeLog b/x11-themes/fvwm-crystal/ChangeLog index 3c63ade45955..5975414025af 100644 --- a/x11-themes/fvwm-crystal/ChangeLog +++ b/x11-themes/fvwm-crystal/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-themes/fvwm-crystal # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.3 2004/03/13 19:52:10 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.4 2004/03/25 19:14:15 taviso Exp $ + + 25 Mar 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-crystal-1.0.1.ebuild, + files/fvwm-crystal-fvwm-version-check.diff: + configure logic to check fvwm version doesnt work. 13 Mar 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-crystal-1.0.1.ebuild: adding some einfo about some other supported applications mentioned diff --git a/x11-themes/fvwm-crystal/Manifest b/x11-themes/fvwm-crystal/Manifest index 0387cee76ce2..f3f09462d8e1 100644 --- a/x11-themes/fvwm-crystal/Manifest +++ b/x11-themes/fvwm-crystal/Manifest @@ -1,4 +1,5 @@ -MD5 127f355f278a1bd3d363cb0d3164894f ChangeLog 787 -MD5 11f48dc3ef7449777e36d9a2e1a5db3d fvwm-crystal-1.0.1.ebuild 1734 +MD5 e126674ef79d97a9fdc907b9b8e4617b fvwm-crystal-1.0.1.ebuild 1990 +MD5 31bf8486b32aacd373aa4494804d34e1 ChangeLog 963 MD5 5ab7acb96f04eda6ec527059668aac7b metadata.xml 251 MD5 d2d23021573eab4cf7108ba429abf1a1 files/digest-fvwm-crystal-1.0.1 70 +MD5 8146e2077293da51342d5f6d09cec37a files/fvwm-crystal-fvwm-version-check.diff 429 diff --git a/x11-themes/fvwm-crystal/files/fvwm-crystal-fvwm-version-check.diff b/x11-themes/fvwm-crystal/files/fvwm-crystal-fvwm-version-check.diff new file mode 100644 index 000000000000..325e32a84f34 --- /dev/null +++ b/x11-themes/fvwm-crystal/files/fvwm-crystal-fvwm-version-check.diff @@ -0,0 +1,12 @@ +--- configure.in 2004-01-01 21:03:42.000000000 +0000 ++++ configure.in 2004-03-25 18:55:30.441245224 +0000 +@@ -27,8 +27,7 @@ + if test "x$FVWM_VERSION" = "x"; then FVWM_VERSION=unknown; fi + AC_SUBST(FVWM_VERSION)dnl + +-if (echo $REQUIRED_FVWM_VERSION; echo $FVWM_VERSION) \ +-| sed 's/\./ /g' | uniq | sort -n -c 2>/dev/null; then ++if test ${REQUIRED_FVWM_VERSION//./} -le ${FVWM_VERSION//./}; then + : + # fvwm version is ok + else diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild index 109c31db7aec..a2556defb992 100644 --- a/x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild +++ b/x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild,v 1.6 2004/03/14 11:00:43 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild,v 1.7 2004/03/25 19:14:15 taviso Exp $ DESCRIPTION="A very nice and powerful theme for FVWM" HOMEPAGE="http://fvwm-crystal.linuxpl.org/" @@ -11,7 +11,7 @@ SLOT="0" KEYWORDS="~x86" IUSE="xmms" -RDEPEND=">=x11-wm/fvwm-2.5.9 +RDEPEND=">=x11-wm/fvwm-2.5.8 xmms? ( media-plugins/xmms-shell >=media-sound/xmms-1.2.7 media-plugins/xmms-find ) @@ -27,14 +27,26 @@ RDEPEND=">=x11-wm/fvwm-2.5.9 DEPEND="${RDEPEND} sys-devel/automake" -src_compile() { +src_unpack() { + unpack ${A} + cd ${S}; epatch ${FILESDIR}/fvwm-crystal-fvwm-version-check.diff + # cp: cannot stat `INSTALL.CVS': No such file or directory # cp: cannot stat `INSTALL-PL.CVS': No such file or directory # make: *** [install] Error 1 - ebegin "Updating Makefile..." + ebegin "Updating Makefile" automake || die eend $? + # configure: error: + # You have fvwm-2.5.10, which is not up to date + # You need at least fvwm-2.5.8 + ebegin "Updating configure script" + autoconf || die + eend $? +} + +src_compile() { # doesnt make any difference with this version but if xmms # support controls any features in future, we shouldnt leave # it up to configure to enable it. |