diff options
| -rw-r--r-- | app-misc/realpath/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/realpath/Manifest | 12 | ||||
| -rw-r--r-- | app-misc/realpath/files/realpath-1.15-build.patch | 2 | ||||
| -rw-r--r-- | app-misc/realpath/files/realpath-1.15-prefix.patch | 22 |
4 files changed, 22 insertions, 20 deletions
diff --git a/app-misc/realpath/ChangeLog b/app-misc/realpath/ChangeLog index aa5d18e1dce8..8f8454551b87 100644 --- a/app-misc/realpath/ChangeLog +++ b/app-misc/realpath/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/realpath # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/ChangeLog,v 1.11 2010/11/28 15:02:15 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/ChangeLog,v 1.12 2010/11/28 18:23:29 jlec Exp $ + + 28 Nov 2010; Justin Lecher <jlec@gentoo.org> files/realpath-1.15-build.patch, + files/realpath-1.15-prefix.patch: + Fixes for broken patch *realpath-1.15-r3 (28 Nov 2010) diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest index 079b78e93c5b..ff6a167f22f7 100644 --- a/app-misc/realpath/Manifest +++ b/app-misc/realpath/Manifest @@ -3,21 +3,21 @@ Hash: SHA1 AUX realpath-1.14-build.patch 1019 RMD160 d9a19eadd3ef17347e901d00f662f9b265581e8b SHA1 9fd50083a6dee83f4fe6d77ef70cde85f3814a5a SHA256 050432c91359228e47e57c989425428096a081b9c82ae037ec3876fac1fabafc AUX realpath-1.14-no-po4a.patch 288 RMD160 0c652a04b84432353b0547dba1454a4784350ee6 SHA1 0ef6f48971ffd947e09361225c1faf6d2f6f6c32 SHA256 5fc4321c8e6a3906366d198d309768de026b628ec320bf4c00c137f9fa6eeacc -AUX realpath-1.15-build.patch 1007 RMD160 c5db22b3db8a9bd3b20834a3eff550224643e7ab SHA1 11e27b4c621d2ee29043cd0ea02a6474f94d2655 SHA256 b4246f628f5265ebb7581dcb04203ac06f1a223b6bb01b430045d440f5667b4e +AUX realpath-1.15-build.patch 1062 RMD160 e5df1a615d83d4dd01bca645572cb5569d328a88 SHA1 838fb4a7557380705d3e9b8070844be8e08109fd SHA256 5ece9c5f0ea198f2e045439e44240e5acd5f4e4e95b27e780b93d69baf788d1c AUX realpath-1.15-nonls.patch 583 RMD160 a8c791e5660616a696247cf07a59d87589fa34b9 SHA1 14495120ca591ae4126321d0dffd660066b4f3c4 SHA256 c8ef7560ba210b2fec7397e287bb4e3073ca14cbccf5e77f34f52886a0722c7a -AUX realpath-1.15-prefix.patch 1376 RMD160 d4d2c7b25449a76ec9f9359cc28d00f6a79fb051 SHA1 f8eec6945bede799f65db97e51c65ac27e163896 SHA256 3a02646e51597458ce1e42ad505c387ed0c4869b60ac5d407e7c812d24d176ab +AUX realpath-1.15-prefix.patch 1443 RMD160 fcf72dedc5ce1308a8ec554974dbd92b7698c312 SHA1 4e569d5ee2bf20986f22eee9ee88fee1ee7e3730 SHA256 df01fbc26743f1d25715589827aed7e1c68444ce596225f2aca571a75029cf27 DIST realpath_1.15.tar.gz 17406 RMD160 83129946171248446b3bcd1eae8ad82217c4248d SHA1 27174ef37d846761a12ebd81af1398327ee824b9 SHA256 b3d11cec375145ea60663e6fe54727c70a0e86c18f40bddac2a89b635cc1531f DIST realpath_1.15_i386.deb 15670 RMD160 cedc694ff0e7302581ee3a81ba951ca591309828 SHA1 a890ea32d012d712fc263a68a076631805feab4c SHA256 6fdcace221422a042d7fce941e46977adfb3b1da44d23e8be00628c56d726d3e EBUILD realpath-1.15-r1.ebuild 1676 RMD160 0f2bede4b8df3b3c49c46bd04b040c5f14b56248 SHA1 19600c41b1db7b3dca23fc11317ac80b67dedc3d SHA256 9289fd4c582eb386037164f84b423fe158e3f436b9e57c4ec3447d15967273f9 EBUILD realpath-1.15-r2.ebuild 2373 RMD160 76fa955ba8add3afafd2cbe0bc41014e05f24612 SHA1 cfa872d142e9f7084420409cca9e3686cfadea10 SHA256 f92f132fc8caf82dfbe76b9d463c03f17d75df4ba04aeec8c504f2ee04612e86 EBUILD realpath-1.15-r3.ebuild 2367 RMD160 bd4786e10769ff0a3240150f75e68f841e65c2dc SHA1 b782e48d607d31f2464722d6debcdfb95ee38e37 SHA256 66e6885792c34fd88ea70e5dfae7d2631aeae89a8500a6df155c15a3892aa573 EBUILD realpath-1.15.ebuild 1622 RMD160 38c07807aebe4e13afe78c4b05568dae384d2d48 SHA1 72735665619d065d6016b28e264b0b04d18e554c SHA256 815c12beadef024bedf1388b2a605a08eaa77f440d79ac2dd0f15e0722b9dea3 -MISC ChangeLog 7586 RMD160 ec1c06c86cfff36bf3a0d54f36a85a01f1fbce76 SHA1 7eeaf14335a6371530e1a235d3ff6636d9411c7c SHA256 9a1be8464358cdaca491c6af6d861aea7216c2d589a55ef4ab1d584f7f43bfe2 +MISC ChangeLog 7728 RMD160 fa3a1bc3b19756001979d6668f7a10f5f1c88630 SHA1 fee50d88e704a842e82dd4987a057cee4654bdb8 SHA256 7e25b9bad4130482c07590a1cf5da2523a937135f47a636d404e112bd1a6e022 MISC metadata.xml 328 RMD160 405f12dbe5abd64eccefcefead9cb2662b687b1f SHA1 c2dafdc2d68df2e12665c5b15d88010414497af1 SHA256 71d668f1cb87b5412b35f181bc761921019e7502b7b56bf7ea9aa5c514e939e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkzybv0ACgkQgAnW8HDreRYHQgCfYa7QyD2ZgPA+tDl7l/NT91AQ -5ZEAn3FTYrT9WarskHw66/OTH/ZnCQa/ -=0U51 +iEYEARECAAYFAkzyniYACgkQgAnW8HDreRZpMwCgnfKie3afHCpsVlgVrgY/DP8O +L/UAn2JH+iWtGZP4WCF6Utx4ZP00upiZ +=Vj6e -----END PGP SIGNATURE----- diff --git a/app-misc/realpath/files/realpath-1.15-build.patch b/app-misc/realpath/files/realpath-1.15-build.patch index eb3defaea1b6..7f7d586f5736 100644 --- a/app-misc/realpath/files/realpath-1.15-build.patch +++ b/app-misc/realpath/files/realpath-1.15-build.patch @@ -10,7 +10,7 @@ index 18f539c..142f7e6 100644 -CFLAGS = -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Werror -g -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' -LDFLAGS := +CC ?= gcc -+CFLAGS += -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' ++CFLAGS += -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' +LDFLAGS += LIBS := diff --git a/app-misc/realpath/files/realpath-1.15-prefix.patch b/app-misc/realpath/files/realpath-1.15-prefix.patch index 480425b2dfe6..f9534641382f 100644 --- a/app-misc/realpath/files/realpath-1.15-prefix.patch +++ b/app-misc/realpath/files/realpath-1.15-prefix.patch @@ -1,13 +1,14 @@ -* <grobian@gentoo.org>: /bin/sh is no good (on e.g. Solaris) same for perl - ---- common.mk -+++ common.mk -@@ -8,16 +8,17 @@ +diff --git a/common.mk b/common.mk +index 2443a40..0a342ee 100644 +--- a/common.mk ++++ b/common.mk +@@ -8,17 +8,19 @@ override TOPDIR := $(dir $(call getCurrentMakefileName)) override PACKAGE := realpath -PATH := /usr/bin:/usr/sbin:/bin:/sbin:$(PATH) +#PATH := /usr/bin:/usr/sbin:/bin:/sbin:$(PATH) ++ +SHELL := @GENTOO_PORTAGE_EPREFIX@/bin/bash # build abstraction @@ -21,11 +22,13 @@ compress := gzip -9f -prefix := /usr +-etcdir := /etc/$(PACKAGE) +prefix := @GENTOO_PORTAGE_EPREFIX@/usr - etcdir := /etc/$(PACKAGE) ++etcdir := @GENTOO_PORTAGE_EPREFIX@/etc/$(PACKAGE) bindir := $(prefix)/bin sbindir := $(prefix)/sbin -@@ -33,11 +34,11 @@ + mandir := $(prefix)/share/man +@@ -33,7 +35,7 @@ webdocrootdir := /var/www webcgidir := $(prefix)/lib/cgi-bin applicationsdir := $(prefix)/share/applications @@ -34,8 +37,3 @@ CC ?= gcc CFLAGS += -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' LDFLAGS += --LIBS := -+LIBS += - - ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 |