Changeset - d2ebf60fbf1d
[Not reviewed]
default
2 7 0
Nathan Brink (binki) - 15 years ago 2010-02-26 13:45:46
ohnobinki@ohnopublishing.net
sys-devel/libtool: Fix up patch to be bourne and POSIX compatible, thanks to ferret_; reviewed by tommy[d].
9 files changed with 33 insertions and 369 deletions:
0 comments (0 inline, 0 general)
media-gfx/imagemagick/Manifest
Show inline comments
 
-----BEGIN PGP SIGNED MESSAGE-----
 
Hash: SHA1
 

	
 
DIST ImageMagick-6.5.2-9.tar.bz2 8819668 RMD160 01aa6604339eaee031b06aae27a4074ac36a88e1 SHA1 1eb8cb876742dba833917c30b10bfef215d4f261 SHA256 5bc9958ce4db8d36c6bd92f8e7c95aafc63aeb03694cdf1fdd4b3f3ae953ef4c
 
DIST ImageMagick-6.5.4-10.tar.bz2 8819304 RMD160 b48f8b8c0c9ec8cc01a38eee45868d540b3845db SHA1 87fd01d4399c8caba2f505c35618117b5296a1cc SHA256 b27117bfafc989ce74214db116a5b3bd1fda0e501839faab09c715c8647cd8eb
 
DIST ImageMagick-6.5.7-0.tar.bz2 8709712 RMD160 a15e1aba983c4bac7b73d4b992fe0fc56bf4f665 SHA1 f48b6708b9dc055938219108f77fc4369b962ffc SHA256 ceefefcfe2e670f2f5a52a8f2575ba99e445aaa3204a44736832436adc5eb642
 
DIST ImageMagick-6.5.8-8.tar.bz2 8711782 RMD160 1417878f2adae344f840807710e7f9485d5945ce SHA1 15212833489826f7d2d919d1442309d6dc504402 SHA256 3a81e6c6759f6266dd18e8bb6c6c6791d5af8871e2dc2e50fb9c9362f3e689eb
 
DIST ImageMagick-6.5.9-4.tar.bz2 8746631 RMD160 8e9702f77e4db6f80dd27024e576b721f8d57ef2 SHA1 cc6bd595a1040da8423b7f9eccf68212dc83d9e1 SHA256 bc95ba56ac78e35a42199d3f79c7ac20bdb001ad61f58b81923e6da99d60b517
 
EBUILD imagemagick-6.5.2.9.ebuild 4868 RMD160 daa91a0e2db50e0450f2f6ed4b35910cba9b909e SHA1 00fdd574223265fb8cfe344fe22bdbf591fecce8 SHA256 8092331f339e8b2f3bda2925dab69948b9e32c93a6919e93d7053cc9f6400dfe
 
EBUILD imagemagick-6.5.4.10.ebuild 5039 RMD160 e314999828e0c4daaf3f6b6dfda536807d2c732f SHA1 9ddb71dacb9bb31f6f21df18715f13a5fc592181 SHA256 cba7f7d52fb1b40fa45880f73869e6d8f2f32ef0a9acf21a885da373a1257a49
 
EBUILD imagemagick-6.5.7.0.ebuild 5028 RMD160 a3fd35073798419167e95475ac99cc72ee8c687d SHA1 7419eca5cc222234725170d887fc710fa83be5bb SHA256 f005cf9628025204926d20059af8252af925d5ffd3878381476e83fbba351a0b
 
EBUILD imagemagick-6.5.8.8.ebuild 5043 RMD160 30cc2d9073502175a34f5b5c44e918234b34156b SHA1 7138917a57c688ea7e54350565b9fed3073017ad SHA256 edce0aedf574f3889b57fee10a6947c82ef2a0fe57a53b24855f797f9b80c0e3
 
EBUILD imagemagick-6.5.9.4-r1.ebuild 4968 RMD160 6974d4058515aec2f4e89e3ce39ed4b0a8f1d8bd SHA1 8f6ccd56b1afe00b1631c3320236787c5f10d251 SHA256 9c4669c261a06fed0178bfb4fb42b8c8ffac7b5eda66ee137efa54624be66018
 
EBUILD imagemagick-6.5.7.0.ebuild 5162 RMD160 43f0a956ae5fd0b16d989443c246b44f3efa8593 SHA1 9fb7c3337d849dac984aa1c577712b277eec2eee SHA256 7f428992e304175255fde9e1d3c8e501c96e287b6ef778b0c891322e2976f069
 
EBUILD imagemagick-6.5.8.8.ebuild 5177 RMD160 ce804332bf5d5d1db34d84f04f2eb3a2981c8a6a SHA1 7574741a9e545c06be0310a891c1b48c1f468cc5 SHA256 3783a39ea6f7f091fb27f77bde3e80436e7e026c43bcf8bd5f74666070510923
 
EBUILD imagemagick-6.5.9.4-r1.ebuild 5102 RMD160 0e646669a3f5a15d2e63d8f27122a13f1969eb29 SHA1 2f0b90411ca6131054ac3fe86b933a39d6fdef41 SHA256 e14bd6f1051846e76f549caf9fc4c729c8904d8a7a20c3c963f3d25ce821f0c4
 
MISC ChangeLog 57879 RMD160 b707fe35c7fd7880eda3332bf9dc1bc6eddf911a SHA1 2ce203a49dbc8797429ecf09caab75438a310c8e SHA256 79385e6ff355ed4626f061c54fca59197767d500791cba31f1e9d8df18a452fe
 
MISC metadata.xml 813 RMD160 1a299d749c40a81c6255e74b055d51bb2574947d SHA1 28be5abfb85ef530e3ec5a84678e914175435ed4 SHA256 53592450b5a53784153fc95d665dee08392968adab41bd3032ad759778bde31b
 
-----BEGIN PGP SIGNATURE-----
 
Version: GnuPG v2.0.14 (GNU/Linux)
 

	
 
iEYEARECAAYFAkuBrVAACgkQNQqtfCuFneM2iwCfVQUTZ1v1AoaTRrZPLzhrv7MI
 
i4oAnRpT3PcSfPNQ2RFp70vzLILF0e/q
 
=m62u
 
-----END PGP SIGNATURE-----
media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild
Show inline comments
 
deleted file
media-gfx/imagemagick/imagemagick-6.5.4.10.ebuild
Show inline comments
 
deleted file
media-gfx/imagemagick/imagemagick-6.5.7.0.ebuild
Show inline comments
 
# Copyright 1999-2010 Gentoo Foundation
 
# Distributed under the terms of the GNU General Public License v2
 
# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.7.0.ebuild,v 1.11 2010/02/11 20:23:27 jer Exp $
 

	
 
EAPI="2"
 

	
 
inherit eutils multilib perl-app toolchain-funcs versionator
 
WANT_AUTOMAKE=1.11
 
inherit autotools eutils multilib perl-app toolchain-funcs versionator
 

	
 
MY_PN=ImageMagick
 
MY_P=${MY_PN}-${PV%.*}
 
MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
 

	
 
DESCRIPTION="A collection of tools and libraries for many image formats"
 
HOMEPAGE="http://www.imagemagick.org/"
 
SRC_URI="mirror://imagemagick/${MY_P2}.tar.bz2
 
		 mirror://imagemagick/legacy/${MY_P2}.tar.bz2"
 

	
 
# perl tests fail with userpriv
 
RESTRICT="perl? ( userpriv )"
 
@@ -53,43 +54,47 @@ RDEPEND="
 
		x11-libs/libXt
 
		x11-libs/libICE
 
		x11-libs/libSM
 
		svg? ( >=gnome-base/librsvg-2.9.0 )
 
	)
 
	!dev-perl/perlmagick
 
	!media-gfx/graphicsmagick[imagemagick]
 
	!sys-apps/compare
 
	>=sys-devel/libtool-1.5.2-r6"
 

	
 
DEPEND="${RDEPEND}
 
	>=sys-apps/sed-4
 
	>=sys-devel/libtool-2.2.6b-r1
 
	X? ( x11-proto/xextproto )"
 

	
 
S="${WORKDIR}/${MY_P2}"
 

	
 
pkg_setup() {
 
	# for now, only build svg support when X is enabled, as librsvg
 
	# pulls in quite some X dependencies.
 
	if use svg && ! use X ; then
 
		elog "the svg USE-flag requires the X USE-flag set."
 
		elog "disabling svg support for now."
 
	fi
 

	
 
	if use corefonts && ! use truetype ; then
 
		elog "corefonts USE-flag requires the truetype USE-flag to be set."
 
		elog "disabling corefonts support for now."
 
	fi
 
}
 

	
 
src_prepare() {
 
	# get shiney new ltdl.m4 from =sys-devel/libtool-2.2.6b-r1
 
	eautoreconf
 

	
 
	# fix doc dir, bug #91911
 
	sed -i -e \
 
		's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \
 
		"${S}"/configure || die
 
}
 

	
 
src_configure() {
 
	local myconf
 
	if use q32 ; then
 
		myconf="${myconf} --with-quantum-depth=32"
 
	elif use q8 ; then
 
		myconf="${myconf} --with-quantum-depth=8"
media-gfx/imagemagick/imagemagick-6.5.8.8.ebuild
Show inline comments
 
# Copyright 1999-2010 Gentoo Foundation
 
# Distributed under the terms of the GNU General Public License v2
 
# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.8.8.ebuild,v 1.5 2010/02/21 21:58:11 fauli Exp $
 

	
 
EAPI="2"
 

	
 
inherit eutils multilib perl-app toolchain-funcs versionator
 
WANT_AUTOMAKE=1.11
 
inherit autotools eutils multilib perl-app toolchain-funcs versionator
 

	
 
MY_PN=ImageMagick
 
MY_P=${MY_PN}-${PV%.*}
 
MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
 

	
 
DESCRIPTION="A collection of tools and libraries for many image formats"
 
HOMEPAGE="http://www.imagemagick.org/"
 
SRC_URI="mirror://imagemagick/${MY_P2}.tar.bz2
 
		 mirror://imagemagick/legacy/${MY_P2}.tar.bz2"
 

	
 
# perl tests fail with userpriv
 
RESTRICT="perl? ( userpriv )"
 
@@ -53,43 +54,47 @@ RDEPEND="
 
		x11-libs/libXt
 
		x11-libs/libICE
 
		x11-libs/libSM
 
		svg? ( >=gnome-base/librsvg-2.9.0 )
 
	)
 
	!dev-perl/perlmagick
 
	!media-gfx/graphicsmagick[imagemagick]
 
	!sys-apps/compare
 
	>=sys-devel/libtool-1.5.2-r6"
 

	
 
DEPEND="${RDEPEND}
 
	>=sys-apps/sed-4
 
	>=sys-devel/libtool-2.2.6b-r1
 
	X? ( x11-proto/xextproto )"
 

	
 
S="${WORKDIR}/${MY_P2}"
 

	
 
pkg_setup() {
 
	# for now, only build svg support when X is enabled, as librsvg
 
	# pulls in quite some X dependencies.
 
	if use svg && ! use X ; then
 
		elog "the svg USE-flag requires the X USE-flag set."
 
		elog "disabling svg support for now."
 
	fi
 

	
 
	if use corefonts && ! use truetype ; then
 
		elog "corefonts USE-flag requires the truetype USE-flag to be set."
 
		elog "disabling corefonts support for now."
 
	fi
 
}
 

	
 
src_prepare() {
 
	# get shiney new ltdl.m4 from =sys-devel/libtool-2.2.6b-r1
 
	eautoreconf
 

	
 
	# fix doc dir, bug #91911
 
	sed -i -e \
 
		's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \
 
		"${S}"/configure || die
 
}
 

	
 
src_configure() {
 
	local myconf
 
	if use q32 ; then
 
		myconf="${myconf} --with-quantum-depth=32"
 
	elif use q8 ; then
 
		myconf="${myconf} --with-quantum-depth=8"
media-gfx/imagemagick/imagemagick-6.5.9.4-r1.ebuild
Show inline comments
 
# Copyright 1999-2010 Gentoo Foundation
 
# Distributed under the terms of the GNU General Public License v2
 
# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.9.4-r1.ebuild,v 1.1 2010/02/15 19:04:44 ssuominen Exp $
 

	
 
EAPI="2"
 

	
 
inherit eutils multilib perl-app toolchain-funcs versionator
 
WANT_AUTOMAKE=1.11
 
inherit autotools eutils multilib perl-app toolchain-funcs versionator
 

	
 
MY_PN=ImageMagick
 
MY_P=${MY_PN}-${PV%.*}
 
MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
 

	
 
DESCRIPTION="A collection of tools and libraries for many image formats"
 
HOMEPAGE="http://www.imagemagick.org/"
 
SRC_URI="mirror://imagemagick/${MY_P2}.tar.bz2
 
		 mirror://imagemagick/legacy/${MY_P2}.tar.bz2"
 

	
 
# perl tests fail with userpriv
 
RESTRICT="perl? ( userpriv )"
 
@@ -53,43 +54,47 @@ RDEPEND="
 
		x11-libs/libXt
 
		x11-libs/libICE
 
		x11-libs/libSM
 
		svg? ( >=gnome-base/librsvg-2.9.0 )
 
	)
 
	!dev-perl/perlmagick
 
	!media-gfx/graphicsmagick[imagemagick]
 
	!sys-apps/compare
 
	>=sys-devel/libtool-1.5.2-r6"
 

	
 
DEPEND="${RDEPEND}
 
	>=sys-apps/sed-4
 
	>=sys-devel/libtool-2.2.6b-r1
 
	X? ( x11-proto/xextproto )"
 

	
 
S="${WORKDIR}/${MY_P2}"
 

	
 
pkg_setup() {
 
	# for now, only build svg support when X is enabled, as librsvg
 
	# pulls in quite some X dependencies.
 
	if use svg && ! use X ; then
 
		elog "the svg USE-flag requires the X USE-flag set."
 
		elog "disabling svg support for now."
 
	fi
 

	
 
	if use corefonts && ! use truetype ; then
 
		elog "corefonts USE-flag requires the truetype USE-flag to be set."
 
		elog "disabling corefonts support for now."
 
	fi
 
}
 

	
 
src_prepare() {
 
	# get shiney new ltdl.m4 from =sys-devel/libtool-2.2.6b-r1
 
	eautoreconf
 

	
 
	# fix doc dir, bug #91911
 
	sed -i -e \
 
		's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \
 
		"${S}"/configure || die
 
}
 

	
 
src_configure() {
 
	local myconf
 
	if use q32 ; then
 
		myconf="${myconf} --with-quantum-depth=32"
 
	elif use q8 ; then
 
		myconf="${myconf} --with-quantum-depth=8"
sys-devel/libtool/ChangeLog
Show inline comments
 
# ChangeLog for sys-devel/libtool
 
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 
# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.165 2009/12/09 17:45:58 armin76 Exp $
 

	
 
  26 Feb 2010; Nathan Phillip Brink (ohnobinki)
 
  <ohnobinki@ohnopublishing.net>
 
  files/2.2.6b/libtool-2.2.6b-ltdl.m4-no-la.patch:
 
  Fix up patch to be bourne and POSIX compatible, thanks to ferret_;
 
  reviewed by tommy[d].
 

	
 
  26 Feb 2010; Nathan Phillip Brink (ohnobinki)
 
  <ohnobinki@ohnopublishing.net> -libtool-1.3.5.ebuild,
 
  -files/1.5.20/libtool-1.5.20-override-LD_LIBRARY_PATH.patch,
 
  -libtool-1.5.26.ebuild, -libtool-1.5.26-r1.ebuild,
 
  -files/1.5.6/libtool-1.5-filter-host-tags.patch, -libtool-2.2.6b.ebuild,
 
  +libtool-2.2.6b-r1.ebuild,
 
  +files/2.2.6b/libtool-2.2.6b-ltdl.m4-no-la.patch, libtool-9999.ebuild:
 
  Simple patch against ltdl.m4 for bug 293921 . Removed old versions of
 
  libtool.
 

	
 
  09 Dec 2009; Raúl Porcel <armin76@gentoo.org> libtool-2.2.6b.ebuild:
 
  alpha/ia64/m68k/s390/sh stable wrt #295535
 

	
sys-devel/libtool/Manifest
Show inline comments
 
AUX 1.5.10/libtool-1.5.10-locking.patch 629 RMD160 922b2d8cba8e869afc9a1cde9ec0065e1ccaadcf SHA1 6d6b77b42b4729b48c7bf0ad6f8a4b962bc97298 SHA256 14b54a1c2c01e7e0f2399b253a5e9603c5f8f59ac655489bd74ee9e8cf8a3774
 
AUX 1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185 RMD160 ed02facdc5fd1ea9ffd403f5641f620791d833db SHA1 8d5784695682e3e8a271a9ed635d9d1566c4e99b SHA256 6a17e149e3638c3c94679459e1201f5dd7abbe97e5c8ab3654c1a0d079f53326
 
AUX 1.5.20/libtool-1.5.20-version-checking.patch 1857 RMD160 25b981402a038a2c4c5ad64066c5f8a5b1416b36 SHA1 c5000fa6da0ffec1d7c48d871db94d8237c949ca SHA256 0d1af5e7024949dcf95bef0d5a47387d0b04b7905d0a55d3349576733783bb6d
 
AUX 2.2.6a/libtool-2.2.6a-gnuinfo.patch 1454 RMD160 1342700e864e985559dd55f9d49a7d81c9d2a5ee SHA1 9c5410b857551ec202159dd570ca8a81f40d507e SHA256 a06eee9bbbbb617c6b8014bb67ba1442b0b0a618079998d1f629a6043c97083a
 
AUX 2.2.6a/libtool-2.2.6a-tests-locale.patch 599 RMD160 be9e1d21e56a36c5d4d959135afa5928298a66b0 SHA1 a4ae6a4df7b0d43d4d09d07f4aed5edccddf6e55 SHA256 3832137bfb2e4cbf00467ec78ab7041bb7f0fc95d91cdee25717d19b8436c1a0
 
AUX 2.2.6b/libtool-2.2.6b-ltdl.m4-no-la.patch 924 RMD160 1bd74d2fa0326af7f2ecb318dcb2057b87d44496 SHA1 b1b64b9621fef7d68d2e492e37c4c2f9a721a635 SHA256 b844582777579ee89cf874c462c103eaac6601238d3bc17b354e2290d4ccd2cf
 
AUX 2.2.6b/libtool-2.2.6b-ltdl.m4-no-la.patch 979 RMD160 2a4b8e60c5809d5959ee45661f9660f2a189091f SHA1 6252ff679a187d695b8b213bd08cd791aa5288e7 SHA256 49473f038399cea94cb917785bba914b9d5b326f96f2b02dc9f31e5db8e61fef
 
DIST libtool-2.2.6b.tar.lzma 739089 RMD160 cb209df9819510928c17d36ce8b461bd8418a6a1 SHA1 18baaac89eed8be7bd2af2d2181598e176029cc6 SHA256 66ebad3c02e5cb6672bfbda1183fb6fc919d33d676eb8be4b7834aa7c3b8b7ae
 
EBUILD libtool-2.2.6b-r1.ebuild 2361 RMD160 a9a6211aac6e3a4150d626cbc6938307c0bc536f SHA1 cabc2995361525b3e8b0f297f0fae1df52b18029 SHA256 841fc2037da809d185ebf394fecd9da1a296439626b04ac2d670b394c1ffa152
 
EBUILD libtool-9999.ebuild 1388 RMD160 25043fd7679e65da1830499375b7e2a5eb674b49 SHA1 a045013c26ea690ad133d1c11da87017cc2fad44 SHA256 8d6a466ddb60ee9f309a689d4ec2bd0dfd87c6cbc911fa53c10b7bd9980a0601
 
MISC ChangeLog 25178 RMD160 7518fdcdf2d5a45a2e217aafe8d1d8ef2a1783c7 SHA1 f650ef24a07b8b8758ba35ec25447d752d3eae95 SHA256 d0b9164297f47582a88ff5df492cfb44d513a09b64939026b6a8bba8583e75c6
 
MISC ChangeLog 25404 RMD160 46c970890829f712c2f1e6733dd470da2c047cd6 SHA1 fd439d0ce1c6437da5d0e136a43f2eff3a9fea1c SHA256 39e03792a5f04a9123d9ce1bb08a9e05846ca60e65633678c55aa39bc5599598
 
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
sys-devel/libtool/files/2.2.6b/libtool-2.2.6b-ltdl.m4-no-la.patch
Show inline comments
 
https://bugs.gentoo.org/293921
 

	
 
ohnobinki's attempt at convincing ltdl.m4 to permit people
 
to delete that special type of libtool archive which has
 
no use on a modern GNU/Linux system.
 

	
 
bourne+POSIX compatibility fixed by ferret_, reviewed by tommy[d].
 

	
 
diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4
 
index 111fac1..4bedc34 100644
 
index 111fac1..0e823ed 100644
 
--- a/libltdl/m4/ltdl.m4
 
+++ b/libltdl/m4/ltdl.m4
 
@@ -282,8 +282,11 @@ AC_ARG_WITH([ltdl_lib],
 
                     [use the libltdl.la installed in DIR])])
 
 
 
 if test -n "$with_ltdl_lib"; then
 
-  if test -f "$with_ltdl_lib/libltdl.la"; then :
 
-  else
 
+  # check for the existence of "$with_ltdl_lib/libltdl.la" while
 
+  # allowing people to libtool archive file (which isn't useful
 
+  # in this case in many common platforms.)
 
+  with_ltdl_lib_libname=$(echo "$with_ltdl_lib"/libltdl.*) 2>/dev/null
 
+  with_ltdl_lib_libname=`echo "$with_ltdl_lib"/libltdl.*`
 
+  if test "x$with_ltdl_lib_libname" = "x$with_ltdl_lib/libltdl.*"; then
 
     AC_MSG_ERROR([invalid ltdl library directory: `$with_ltdl_lib'])
 
   fi
 
 else
0 comments (0 inline, 0 general)