diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-08-17 13:14:59 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-08-17 13:14:59 +0000 |
commit | 40b2c47313f9b305449fddacf8f11d1112a2dac8 (patch) | |
tree | df69678b4e1a44e4a0b506274777cd8096785338 /sys-fs/xfsprogs | |
parent | Bump to 0.3.0. Some API updates, new tool to list profiles, more supported pr... (diff) | |
download | historical-40b2c47313f9b305449fddacf8f11d1112a2dac8.tar.gz historical-40b2c47313f9b305449fddacf8f11d1112a2dac8.tar.bz2 historical-40b2c47313f9b305449fddacf8f11d1112a2dac8.zip |
Clean up library install and prefer readline over editline like upstream #311109.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/xfsprogs')
-rw-r--r-- | sys-fs/xfsprogs/ChangeLog | 8 | ||||
-rw-r--r-- | sys-fs/xfsprogs/Manifest | 20 | ||||
-rw-r--r-- | sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch | 129 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-3.0.0.ebuild | 50 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-3.0.1-r1.ebuild | 54 | ||||
-rw-r--r-- | sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild | 49 |
6 files changed, 107 insertions, 203 deletions
diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog index a159016241a0..e568baf682ee 100644 --- a/sys-fs/xfsprogs/ChangeLog +++ b/sys-fs/xfsprogs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/xfsprogs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.124 2010/06/03 21:25:55 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.125 2010/08/17 13:14:59 vapier Exp $ + + 17 Aug 2010; Mike Frysinger <vapier@gentoo.org> -xfsprogs-3.0.0.ebuild, + -xfsprogs-3.0.1-r1.ebuild, files/xfsprogs-3.1.1-sharedlibs.patch, + xfsprogs-3.1.2.ebuild: + Clean up library install and prefer readline over editline like upstream + #311109. *xfsprogs-3.1.2 (03 Jun 2010) diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 3d1049c6dcf3..e63f9b3e93f9 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,20 +1,26 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX xfsprogs-2.10.1-headers.patch 185 RMD160 74ac7ac38b5f5a8b2b303495d85414029a908630 SHA1 13a793d7382273918599066667672a2c75d155bd SHA256 3adf0282b07533e0bec9d4789f650ab5c700d5fb3a937a276d10021014c5011f AUX xfsprogs-2.10.1-parallelmake.patch 755 RMD160 cc4a37bc62b9b190982200d0aa34568bc1caaa86 SHA1 f20e87d5094e65193a264ba0cbe628505e9461c8 SHA256 0f973731856e95e645eba9ddea2978c97cab8714242ac1dffa1a569934dc07e2 AUX xfsprogs-2.8.18-symlinks.patch 339 RMD160 8e2026b0b5c8be70dfcaba94f53ac9211ac6b1a2 SHA1 d7b9387d71556e18ebd6f65fd3a52bc323162844 SHA256 e1b168babbce2e4e18757827b6f53248408fa299ea345def0fb650b8f79f2d16 AUX xfsprogs-3.0.0-parallel-build.patch 884 RMD160 8421d1817db6fe00562772fd0026c2fc20f76682 SHA1 a2009c0f03baa6717b544c9317511bead0cc0881 SHA256 fde2124871cd690d9da10cbc3e9c28c56ff2c982e448bf8b0864ebe80a9a7925 AUX xfsprogs-3.0.1-sharedlibs.patch 2453 RMD160 782f49a1842586d7319872730810c92e967b8a2e SHA1 109f89f130d46a8044c7676976d34c183db12f28 SHA256 57152260aa118159533133e7c1e0e20181237c428ce282f6c70f3c9767cd058b -AUX xfsprogs-3.1.1-sharedlibs.patch 2893 RMD160 e3cbbf4a55f60a5968a084942e65e546c398b174 SHA1 0d7cbb29ece10589311e602d5c511007d69438a5 SHA256 8d29620f5992572a25ec3c0759c0efe289151ac7b0d8fb87ce2f031f9ca2fd77 -DIST xfsprogs-3.0.0.tar.gz 975597 RMD160 2b8d55571340e0aaedbc1e4327f7296ef89a4a3f SHA1 b0054e309ed15972ab7d90096789f1c2cb958b96 SHA256 d7a3e8e6919859c9bb5a6786ecafc3183d2d64ca3935d0cff6fdc66c40503396 -DIST xfsprogs-3.0.1.tar.gz 1270775 RMD160 4fc46697268c0459cfa2481e5d1b9f43d821fbcd SHA1 0961049eb2756765dd926c3ed13cb0b5bf8268d0 SHA256 19f75133a720f3b3736c90f05adf514db3f0ac10c8cd0422878d700f8ffecb38 +AUX xfsprogs-3.1.1-sharedlibs.patch 3139 RMD160 97e323ff78a5890d4dcdc9e0ac7b8bf6f2109ecd SHA1 f2231bd40b8a204fc985c165e4851fa9296d0e11 SHA256 477ec5d2c077b6c87076a8ea64b4e24df93b36460c5b8bea79caa3c0c06d8f0b DIST xfsprogs-3.0.3.tar.gz 1336000 RMD160 ae7195e176b02b4ec0c54b32599aec69f267d52c SHA1 621653d73227c5c273f0dd8972998b4c8dad3eb1 SHA256 58b33a4b19ee85eb14d5c3908fa60ce822d1eccc89f1a9b7839171ab576c0d95 DIST xfsprogs-3.1.2.tar.gz 1375497 RMD160 9ac4a99df3e97928e3b991f236eecab03401d80b SHA1 e96465819b496adf0156bb53313fc1ad884debc6 SHA256 9128046ea978a65560b0e87406af9646a283fa0b54eab1801b971d8a89086ddd DIST xfsprogs_2.10.1-1.tar.gz 1005228 RMD160 c68bd6eeaca88a94ee0898bef15c1d6b8d624539 SHA1 10cea2e56d202990a621a9b5b80061abab3aeb37 SHA256 2c0b17e594729b5b77d1ca90b4fa7e4a4da751324736fdb3a0c742252f929c0a DIST xfsprogs_2.10.2-1.tar.gz 1004686 RMD160 8877f36d16ec236bf826aa3e84a9413bfed3fbdc SHA1 86e5a42a21b0ba78638e16b75d99dadc49e97cce SHA256 220a9911153f9b51d4417188ee751d2ee2e1f112427e52402d05b46f235763cf EBUILD xfsprogs-2.10.1.ebuild 1701 RMD160 d22ebed4348bce617bb776f16613bce7efbaf28a SHA1 765fcfc43fc2801595bfc7e01814bca1075e14ae SHA256 2cd933911eea6a6879830d8f818b4db8ed306ae2f63f6333e22cb3dc14a5cd0a EBUILD xfsprogs-2.10.2.ebuild 1781 RMD160 cd515a142ab9f62b1ab6a06b75f667ce434ea6ca SHA1 d0067e51a542edf0c9c97123378f707371d1c149 SHA256 1826e5b932b4a5a34707e47af4b1794872e0bf7c6fe8e12f6b1ff85e723c49e1 -EBUILD xfsprogs-3.0.0.ebuild 1325 RMD160 2d32d671cc4bd9a1206c658b045646e30958420c SHA1 0cd586c40a4bda93910ec597fae06203bbc53940 SHA256 4bde79cb29ef148f72463c7f355754be5e667c63f8187560e2732b1a55277373 -EBUILD xfsprogs-3.0.1-r1.ebuild 1533 RMD160 4870e8f96bb2d45f05f83040fec8d4b697a33d5d SHA1 1fa14067534d640fe1a1650539904370fbf7a69e SHA256 904504f0e138a917316f971d0a3622bebd94888451b6ba8b3123f57cd03a52f9 EBUILD xfsprogs-3.0.3.ebuild 1526 RMD160 1384dad6ab5a2caafce5bdaa02537e5d9f374207 SHA1 d8dc3f723755d285e22945448c08aded90b6e1f4 SHA256 47e74e9f9db9864f8e77f536809157d3fe8a0d526c4eb827e6b396735d04b5c9 -EBUILD xfsprogs-3.1.2.ebuild 3196 RMD160 082316ca9e07b3a399d09d8bb3ab4ce839a19ccd SHA1 edd143dd2d736590a41cedc54621e18b04c933b0 SHA256 d612d903e04e02b7f5034216d790f957b2f289047e5a45b056d01d0303afa619 -MISC ChangeLog 19861 RMD160 596bf246acffe5f832f480028c181d4e27d06254 SHA1 7cf5b2dd22363e82f2a7d79f1f6412d4d2ca4b4d SHA256 d72c8e003c98afb839606e3e624c9b1e6eb4a236abe7e382db604af7b4601db0 +EBUILD xfsprogs-3.1.2.ebuild 2724 RMD160 73674b73d99a42881dc7a550e474e51d3ae65ec5 SHA1 2196d09a3924ae3874632cb906440cc802263735 SHA256 7229b62f29c90b872ce994b864afae4ebea4ed2c99166d900c6b4828697e9bd2 +MISC ChangeLog 20113 RMD160 85596330894aabd56366431dc1b62825294956c3 SHA1 756e0549058963656c1d303be000d77e6a94e7f3 SHA256 4ae7e1e245f4ec8a3851141a977b6db9195549e2c5d07bce69d9ee574681afc4 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iF4EAREIAAYFAkxqi+oACgkQTwhj9JtAlp7m9wEAyQIa6yV17enLAXjYFsbNipLe +9+czRT9Ej8EncK2LKYsA/1AUCIiCrZfupc6x14AJ3myyCeJ1leqYqlo1SZfP8UoA +=GfHm +-----END PGP SIGNATURE----- diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch index 4e16dd9f477a..8d63ccdb3a24 100644 --- a/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch +++ b/sys-fs/xfsprogs/files/xfsprogs-3.1.1-sharedlibs.patch @@ -1,45 +1,8 @@ -diff --git a/Makefile b/Makefile -index 83d1b0a..3e4217d 100644 ---- a/Makefile -+++ b/Makefile -@@ -66,6 +66,7 @@ io: libxcmd libhandle - mkfs: libxfs - quota: libxcmd - repair: libxfs libxlog -+libxlog: libxfs - - ifneq ($(ENABLE_BLKID), yes) - mkfs: libdisk -diff --git a/include/buildmacros b/include/buildmacros -index 62babca..0a3c5ba 100644 ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -71,17 +71,9 @@ endif - # /usr/lib. - ifeq ($(ENABLE_SHARED),yes) - INSTALL_LTLIB_DEV = \ -- cd $(TOPDIR)/$(LIBNAME)/.libs; \ -- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ -- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ -- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ -- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ -- if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \ -- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ -- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ -- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ -- fi -+ cd $(TOPDIR)/$(LIBNAME); \ -+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la - else - INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) - endif -diff --git a/libdisk/Makefile b/libdisk/Makefile -index 32416a5..7a144c0 100644 ---- a/libdisk/Makefile -+++ b/libdisk/Makefile -@@ -25,8 +25,10 @@ default: ltdepend $(LTLIBRARY) +ripped from PLD Linux + +--- xfsprogs-3.1.2/libdisk/Makefile ++++ xfsprogs-3.1.2/libdisk/Makefile +@@ -25,8 +25,10 @@ include $(BUILDRULES) install: default @@ -50,11 +13,9 @@ index 32416a5..7a144c0 100644 install-qa: install-dev -diff --git a/libxcmd/Makefile b/libxcmd/Makefile -index 60b6f9e..38e53a6 100644 ---- a/libxcmd/Makefile -+++ b/libxcmd/Makefile -@@ -32,6 +32,12 @@ default: ltdepend $(LTLIBRARY) +--- xfsprogs-3.1.2/libxcmd/Makefile ++++ xfsprogs-3.1.2/libxcmd/Makefile +@@ -32,6 +32,12 @@ include $(BUILDRULES) @@ -68,26 +29,21 @@ index 60b6f9e..38e53a6 100644 +install-qa: default -include .dep -diff --git a/libxfs/Makefile b/libxfs/Makefile -index 8f80cdc..fcba668 100644 ---- a/libxfs/Makefile -+++ b/libxfs/Makefile -@@ -41,8 +41,10 @@ default: ltdepend $(LTLIBRARY) +--- xfsprogs-3.1.2/libxfs/Makefile ++++ xfsprogs-3.1.2/libxfs/Makefile +@@ -41,7 +41,9 @@ include $(BUILDRULES) install: default -+ $(INSTALL_LTLIB) ++ $(INSTALL_LTLIB_ROOT) install-dev: default + $(INSTALL_LTLIB_DEV) install-qa: default - -diff --git a/libxlog/Makefile b/libxlog/Makefile -index 7358fb1..666ea77 100644 ---- a/libxlog/Makefile -+++ b/libxlog/Makefile -@@ -12,6 +12,8 @@ LT_AGE = 0 +--- xfsprogs-3.1.2/libxlog/Makefile ++++ xfsprogs-3.1.2/libxlog/Makefile +@@ -12,6 +12,8 @@ CFILES = xfs_log_recover.c util.c @@ -96,13 +52,13 @@ index 7358fb1..666ea77 100644 # don't want to link xfs_repair with a debug libxlog. DEBUG = -DNDEBUG -@@ -19,6 +21,12 @@ default: ltdepend $(LTLIBRARY) +@@ -19,6 +21,12 @@ include $(BUILDRULES) -install install-dev install-qa: default +install: default -+ $(INSTALL_LTLIB) ++ $(INSTALL_LTLIB_ROOT) + +install-dev: default + $(INSTALL_LTLIB_DEV) @@ -110,3 +66,54 @@ index 7358fb1..666ea77 100644 +install-qa: default -include .dep +--- xfsprogs-3.1.2/Makefile ++++ xfsprogs-3.1.2/Makefile +@@ -66,6 +66,7 @@ + mkfs: libxfs + quota: libxcmd + repair: libxfs libxlog ++libxlog: libxfs + + ifneq ($(ENABLE_BLKID), yes) + mkfs: libdisk +--- xfsprogs-3.1.2/include/buildmacros ++++ xfsprogs-3.1.2/include/buildmacros +@@ -56,11 +56,13 @@ + endif + + ifeq ($(ENABLE_SHARED),yes) +-INSTALL_LTLIB = \ ++_INSTALL_LTLIB = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ +- ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ +- ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR) ++ ../$(INSTALL) -m 755 -d $(1); \ ++ ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(1); \ ++ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(1) ++INSTALL_LTLIB_ROOT = $(call _INSTALL_LTLIB,$(PKG_ROOT_LIB_DIR)) ++INSTALL_LTLIB = $(call _INSTALL_LTLIB,$(PKG_LIB_DIR)) + endif + + # Libtool thinks the static and shared libs should be in the same dir, so +@@ -71,17 +71,9 @@ + # /usr/lib. + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB_DEV = \ +- cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ +- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ +- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ +- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ +- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ +- if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \ +- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ +- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ +- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ +- fi ++ cd $(TOPDIR)/$(LIBNAME); \ ++ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ ++ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la + else + INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) + endif diff --git a/sys-fs/xfsprogs/xfsprogs-3.0.0.ebuild b/sys-fs/xfsprogs/xfsprogs-3.0.0.ebuild deleted file mode 100644 index 5388bdadfb69..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-3.0.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.0.0.ebuild,v 1.4 2009/02/24 05:11:32 vapier Exp $ - -inherit eutils toolchain-funcs autotools - -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="http://oss.sgi.com/projects/xfs/" -SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz - ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" -IUSE="nls" - -RDEPEND="sys-fs/e2fsprogs - !<sys-fs/xfsdump-3" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-parallel-build.patch #260005 - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - include/builddefs.in \ - || die "sed include/builddefs.in failed" - eautoconf -} - -src_compile() { - export DEBUG=-DNDEBUG - export OPTIMIZER=${CFLAGS} - unset PLATFORM # if set in user env, this breaks configure - econf \ - --bindir=/usr/bin \ - --sbindir=/sbin \ - --libexecdir=/usr/$(get_libdir) \ - $(use_enable nls gettext) \ - || die "config failed" - emake || die -} - -src_install() { - emake DIST_ROOT="${D}" install install-dev || die "make install failed" - gen_usr_ldscript -a handle - prepalldocs -} diff --git a/sys-fs/xfsprogs/xfsprogs-3.0.1-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-3.0.1-r1.ebuild deleted file mode 100644 index 8ab2c0fda86f..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-3.0.1-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.0.1-r1.ebuild,v 1.2 2009/09/19 04:55:46 robbat2 Exp $ - -inherit eutils toolchain-funcs multilib - -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="http://oss.sgi.com/projects/xfs/" -SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz - ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~arm" -IUSE="nls static" - -RDEPEND="sys-fs/e2fsprogs - !<sys-fs/xfsdump-3" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-sharedlibs.patch - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - include/builddefs.in \ - || die "sed include/builddefs.in failed" - sed -i '1iLLDFLAGS = -static' {estimate,fsr}/Makefile - sed -i \ - -e "/LLDFLAGS/s:-static:$(use static && echo -all-static):" \ - $(find -name Makefile) -} - -src_compile() { - export DEBUG=-DNDEBUG - export OPTIMIZER=${CFLAGS} - unset PLATFORM # if set in user env, this breaks configure - econf \ - --bindir=/usr/bin \ - --sbindir=/sbin \ - --libexecdir=/usr/$(get_libdir) \ - $(use_enable nls gettext) \ - || die "config failed" - emake || die -} - -src_install() { - emake DIST_ROOT="${D}" install install-dev || die "make install failed" - # handle is for xfsdump, the rest for xfsprogs - gen_usr_ldscript -a disk handle xfs xlog - prepalldocs -} diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild index 3098fcedb278..c762ec8e4b9e 100644 --- a/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild,v 1.2 2010/06/04 02:27:13 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.2.ebuild,v 1.3 2010/08/17 13:14:59 vapier Exp $ EAPI="3" @@ -19,18 +19,17 @@ IUSE="libedit nls readline static static-libs" RDEPEND=">=sys-apps/util-linux-2.17.2 !<sys-fs/xfsdump-3 readline? ( - !libedit? ( sys-libs/readline - static? ( sys-libs/ncurses ) - ) + sys-libs/readline + static? ( sys-libs/ncurses ) ) - libedit? ( dev-libs/libedit )" + !readline? ( libedit? ( dev-libs/libedit ) )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" pkg_setup() { if use readline && use libedit ; then - ewarn "You enabled both readline and libedit support but only one can be supported" - ewarn "Using libedit. Please disable the libedit USE flag if you want readline." + ewarn "You have USE='readline libedit' but these are exclusive." + ewarn "Defaulting to readline; please disable this USE flag if you want libedit." fi if use static && use !static-libs ; then @@ -40,7 +39,7 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}/${PN}-3.1.1-sharedlibs.patch" + epatch "${FILESDIR}"/${PN}-3.1.1-sharedlibs.patch sed -i \ -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ @@ -64,16 +63,16 @@ src_prepare() { } src_configure() { - export DEBUG="-DNDEBUG" - export OPTIMIZER="${CFLAGS}" + export DEBUG=-DNDEBUG + export OPTIMIZER=${CFLAGS} unset PLATFORM # if set in user env, this breaks configure - local myconf="" + local myconf - if use libedit ; then - myconf="--disable-readline --enable-editline" - elif use readline ; then + if use readline ; then myconf="--enable-readline --disable-editline" + elif use libedit ; then + myconf="--disable-readline --enable-editline" else myconf="--disable-readline --disable-editline" fi @@ -87,28 +86,18 @@ src_configure() { econf \ --bindir=/usr/bin \ --libexecdir=/usr/$(get_libdir) \ - $(use_enable static-libs static) \ $(use_enable nls gettext) \ ${myconf} - MAKEOPTS="${MAKEOPTS} V=1" + MAKEOPTS+=" V=1" } src_install() { - # TODO: there is a seldomly triggered parallel install problem where - # libxfs.so doesn't get installed before rdeps causing the relink to fail - emake -j1 DIST_ROOT="${D}" install install-dev || die "emake install failed" - - dosym libxfs.so.0 /$(get_libdir)/libxfs.so - dosym libxlog.so.0 /$(get_libdir)/libxlog.so - - # removing duplicated libraries - rm "${D}"/lib*/lib{handle,xcmd}.* "${D}"/usr/lib*/lib{xfs,xlog}.so* - - # removing unnecessary .la files if not needed - ( use static || use static-libs ) || rm -rf "${D}"/usr/lib*/*.la + emake DIST_ROOT="${D}" install install-dev || die + prepalldocs # handle is for xfsdump, the rest for xfsprogs - gen_usr_ldscript libxfs.so libxlog.so - prepalldocs + gen_usr_ldscript -a xfs xlog + # removing unnecessary .la files if not needed + use static-libs || rm -f "${D}"/usr/lib*/*.la } |