diff options
| -rw-r--r-- | sys-block/parted/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-block/parted/files/parted-2.3-git-version-gen.patch | 39 | ||||
| -rw-r--r-- | sys-block/parted/parted-2.3-r1.ebuild | 72 | ||||
| -rw-r--r-- | sys-block/parted/parted-2.3-r2.ebuild | 74 | ||||
| -rw-r--r-- | sys-block/parted/parted-2.3.ebuild | 70 | ||||
| -rw-r--r-- | sys-block/parted/parted-3.1.ebuild | 75 |
6 files changed, 6 insertions, 331 deletions
diff --git a/sys-block/parted/ChangeLog b/sys-block/parted/ChangeLog index a60211b57824..9b3bb41e265d 100644 --- a/sys-block/parted/ChangeLog +++ b/sys-block/parted/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-block/parted # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/ChangeLog,v 1.43 2013/08/06 13:12:43 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/ChangeLog,v 1.44 2013/09/29 15:24:08 jer Exp $ + + 29 Sep 2013; Jeroen Roovers <jer@gentoo.org> + -files/parted-2.3-git-version-gen.patch, -parted-2.3-r1.ebuild, + -parted-2.3-r2.ebuild, -parted-2.3.ebuild, -parted-3.1.ebuild: + Old. 06 Aug 2013; Agostino Sarubbo <ago@gentoo.org> parted-2.4.ebuild, parted-3.1-r1.ebuild: diff --git a/sys-block/parted/files/parted-2.3-git-version-gen.patch b/sys-block/parted/files/parted-2.3-git-version-gen.patch deleted file mode 100644 index 32f85d4bdf54..000000000000 --- a/sys-block/parted/files/parted-2.3-git-version-gen.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://bugs.gentoo.org/355045 - -[PATCH] git-version-gen: skip "-dirty" check when appropriate - -* build-aux/git-version-gen: Don't run any git commands -when the version comes from .tarball-version. Prior to this, -we would run git update-index --refresh even from a just-unpacked -tarball directory, and that could affect a .git/ directory in a -parent of the build directory. Reported by Mike Frysinger. - -diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen -index 68c7d64..686f703 100755 ---- a/build-aux/git-version-gen -+++ b/build-aux/git-version-gen -@@ -124,13 +124,16 @@ - # Change the first '-' to a '.', so version-comparing tools work properly. - # Remove the "g" in git describe's output string, to save a byte. - v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; -+ v_from_git=1 - else - v=UNKNOWN -+ v_from_git= - fi - - v=`echo "$v" |sed 's/^v//'` - - # Don't declare a version "dirty" merely because a time stamp has changed. -+if test -n "$v_from_git"; then - git update-index --refresh > /dev/null 2>&1 - - dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= -@@ -142,6 +145,7 @@ - *) v="$v-dirty" ;; - esac ;; - esac -+fi - - # Omit the trailing newline, so that m4_esyscmd can use the result directly. - echo "$v" | tr -d "$nl" diff --git a/sys-block/parted/parted-2.3-r1.ebuild b/sys-block/parted/parted-2.3-r1.ebuild deleted file mode 100644 index 8ffbe3431f7f..000000000000 --- a/sys-block/parted/parted-2.3-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.3-r1.ebuild,v 1.5 2013/07/14 22:27:14 jer Exp $ - -EAPI="3" - -inherit autotools eutils - -DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" -HOMEPAGE="http://www.gnu.org/software/parted" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="nls readline +debug selinux device-mapper" - -# specific version for gettext needed -# to fix bug 85999 -RDEPEND=" - >=sys-fs/e2fsprogs-1.27 - >=sys-libs/ncurses-5.2 - nls? ( >=sys-devel/gettext-0.12.1-r2 ) - readline? ( >=sys-libs/readline-5.2 ) - selinux? ( sys-libs/libselinux ) - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-git-version-gen.patch #355045 - - # Remove tests known to FAIL instead of SKIP without OS/userland support - sed -i libparted/tests/Makefile.am \ - -e 's|t3000-symlink.sh||g' || die "sed failed" - sed -i tests/Makefile.am \ - -e '/t4100-msdos-partition-limits.sh/d' \ - -e '/t4100-dvh-partition-limits.sh/d' \ - -e '/t6000-dm.sh/d' || die "sed failed" - - eautoreconf -} - -src_configure() { - econf \ - $(use_with readline) \ - $(use_enable nls) \ - $(use_enable debug) \ - $(use_enable selinux) \ - $(use_enable device-mapper) \ - --disable-rpath \ - --disable-Werror || die "Configure failed" -} - -src_test() { - if use debug; then - # Do not die when tests fail - some requirements are not - # properly checked and should not lead to the ebuild failing. - emake check - else - ewarn "Skipping tests because USE=-debug is set." - fi -} - -src_install() { - emake install DESTDIR="${D}" || die "Install failed" - dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO - dodoc doc/{API,FAT,USER.jp} -} diff --git a/sys-block/parted/parted-2.3-r2.ebuild b/sys-block/parted/parted-2.3-r2.ebuild deleted file mode 100644 index 81be9850e421..000000000000 --- a/sys-block/parted/parted-2.3-r2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.3-r2.ebuild,v 1.4 2013/07/14 22:27:14 jer Exp $ - -EAPI="3" - -inherit autotools eutils - -DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" -HOMEPAGE="http://www.gnu.org/software/parted" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="+debug device-mapper nls readline selinux static-libs" - -# specific version for gettext needed -# to fix bug 85999 -RDEPEND=" - >=sys-fs/e2fsprogs-1.27 - >=sys-libs/ncurses-5.2 - nls? ( >=sys-devel/gettext-0.12.1-r2 ) - readline? ( >=sys-libs/readline-5.2 ) - selinux? ( sys-libs/libselinux ) - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-git-version-gen.patch #355045 - - # Remove tests known to FAIL instead of SKIP without OS/userland support - sed -i libparted/tests/Makefile.am \ - -e 's|t3000-symlink.sh||g' || die "sed failed" - sed -i tests/Makefile.am \ - -e '/t4100-msdos-partition-limits.sh/d' \ - -e '/t4100-dvh-partition-limits.sh/d' \ - -e '/t6000-dm.sh/d' || die "sed failed" - - eautoreconf -} - -src_configure() { - econf \ - $(use_with readline) \ - $(use_enable nls) \ - $(use_enable debug) \ - $(use_enable selinux) \ - $(use_enable device-mapper) \ - $(use_enable static-libs static) \ - --disable-rpath \ - --disable-Werror || die "Configure failed" -} - -src_test() { - if use debug; then - # Do not die when tests fail - some requirements are not - # properly checked and should not lead to the ebuild failing. - emake check - else - ewarn "Skipping tests because USE=-debug is set." - fi -} - -src_install() { - emake install DESTDIR="${D}" || die "Install failed" - dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO - dodoc doc/{API,FAT,USER.jp} - find "${ED}" -name '*.la' -exec rm -f '{}' + -} diff --git a/sys-block/parted/parted-2.3.ebuild b/sys-block/parted/parted-2.3.ebuild deleted file mode 100644 index 155c6f7e8041..000000000000 --- a/sys-block/parted/parted-2.3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.3.ebuild,v 1.5 2013/07/14 22:27:14 jer Exp $ - -EAPI="2" - -inherit autotools eutils - -DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" -HOMEPAGE="http://www.gnu.org/software/parted" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" -IUSE="nls readline +debug selinux device-mapper" - -# specific version for gettext needed -# to fix bug 85999 -RDEPEND=" - >=sys-fs/e2fsprogs-1.27 - >=sys-libs/ncurses-5.2 - nls? ( >=sys-devel/gettext-0.12.1-r2 ) - readline? ( >=sys-libs/readline-5.2 ) - selinux? ( sys-libs/libselinux ) - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - # Remove tests known to FAIL instead of SKIP without OS/userland support - sed -i libparted/tests/Makefile.am \ - -e 's|t3000-symlink.sh||g' || die "sed failed" - sed -i tests/Makefile.am \ - -e '/t4100-msdos-partition-limits.sh/d' \ - -e '/t4100-dvh-partition-limits.sh/d' \ - -e '/t6000-dm.sh/d' || die "sed failed" - - eautoreconf -} - -src_configure() { - econf \ - $(use_with readline) \ - $(use_enable nls) \ - $(use_enable debug) \ - $(use_enable selinux) \ - $(use_enable device-mapper) \ - --disable-rpath \ - --disable-Werror || die "Configure failed" -} - -src_test() { - if use debug; then - # Do not die when tests fail - some requirements are not - # properly checked and should not lead to the ebuild failing. - emake check - else - ewarn "Skipping tests because USE=-debug is set." - fi -} - -src_install() { - emake install DESTDIR="${D}" || die "Install failed" - dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO - dodoc doc/{API,FAT,USER.jp} -} diff --git a/sys-block/parted/parted-3.1.ebuild b/sys-block/parted/parted-3.1.ebuild deleted file mode 100644 index 74a83d2473e1..000000000000 --- a/sys-block/parted/parted-3.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.1.ebuild,v 1.10 2013/07/14 22:27:14 jer Exp $ - -EAPI="4" - -inherit autotools eutils - -DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems" -HOMEPAGE="http://www.gnu.org/software/parted" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" -IUSE="+debug device-mapper nls readline selinux static-libs test" - -# specific version for gettext needed -# to fix bug 85999 -RDEPEND=" - >=sys-fs/e2fsprogs-1.27 - >=sys-libs/ncurses-5.7-r7 - nls? ( >=sys-devel/gettext-0.12.1-r2 ) - readline? ( >=sys-libs/readline-5.2 ) - selinux? ( sys-libs/libselinux ) - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - test? ( >=dev-libs/check-0.9.3 ) -" - -src_prepare() { - # Remove tests known to FAIL instead of SKIP without OS/userland support - sed -i libparted/tests/Makefile.am \ - -e 's|t3000-symlink.sh||g' || die "sed failed" - sed -i tests/Makefile.am \ - -e '/t4100-msdos-partition-limits.sh/d' \ - -e '/t4100-dvh-partition-limits.sh/d' \ - -e '/t6000-dm.sh/d' || die "sed failed" - # there is no configure flag for controlling the dev-libs/check test - sed -i configure.ac \ - -e "s:have_check=[a-z]*:have_check=$(usex test):g" || die - - eautoreconf -} - -src_configure() { - econf \ - $(use_with readline) \ - $(use_enable nls) \ - $(use_enable debug) \ - $(use_enable selinux) \ - $(use_enable device-mapper) \ - $(use_enable static-libs static) \ - --disable-rpath -} - -src_test() { - if use debug; then - # Do not die when tests fail - some requirements are not - # properly checked and should not lead to the ebuild failing. - emake check - else - ewarn "Skipping tests because USE=-debug is set." - fi -} - -src_install() { - emake install DESTDIR="${D}" - dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO - dodoc doc/{API,FAT,USER.jp} - find "${ED}" -name '*.la' -exec rm -f {} + -} |