diff options
| -rw-r--r-- | sys-fs/ntfsprogs/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-fs/ntfsprogs/Manifest | 21 | ||||
| -rw-r--r-- | sys-fs/ntfsprogs/files/ntfsprogs-1.13.0-pkg-config.patch | 119 | ||||
| -rw-r--r-- | sys-fs/ntfsprogs/ntfsprogs-1.13.0.ebuild | 16 |
4 files changed, 150 insertions, 13 deletions
diff --git a/sys-fs/ntfsprogs/ChangeLog b/sys-fs/ntfsprogs/ChangeLog index 5966dee9304c..0d216c587829 100644 --- a/sys-fs/ntfsprogs/ChangeLog +++ b/sys-fs/ntfsprogs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/ntfsprogs # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.29 2006/03/03 01:55:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.30 2006/03/06 02:54:21 vapier Exp $ + + 06 Mar 2006; Mike Frysinger <vapier@gentoo.org> + +files/ntfsprogs-1.13.0-pkg-config.patch, ntfsprogs-1.13.0.ebuild: + Fix fuse detection when gnome support is disabled #124919 by Konstantin + Sobolev. Also add support for USE=crypt. *ntfsprogs-1.13.0 (03 Mar 2006) diff --git a/sys-fs/ntfsprogs/Manifest b/sys-fs/ntfsprogs/Manifest index f9d4d7e75387..ab86c50adf6f 100644 --- a/sys-fs/ntfsprogs/Manifest +++ b/sys-fs/ntfsprogs/Manifest @@ -1,9 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 108150b325ba66f0865f77af89681162 ChangeLog 4991 -RMD160 6e57178826d4b41588ff936c3125e49833e62da0 ChangeLog 4991 -SHA256 25040bf65e2105b093c6932af34e8ef6c461251563a99ae47a6140fc0c3c2e04 ChangeLog 4991 +MD5 5c6c0f22dcc1cb08998383dfc06c7e74 ChangeLog 5228 +RMD160 9babb23098dfe1841e7561ebff593a49fc5e93b8 ChangeLog 5228 +SHA256 01c42045f01c369bd6e128a2a5580ce72a7b427728ef01155c43c716ee435f38 ChangeLog 5228 MD5 0aaf0cd7f2c2123f7d4ed5bcfc96a3d0 files/digest-ntfsprogs-1.11.2 68 RMD160 511e581153770bb71c85b5018e2adf8d67cd2156 files/digest-ntfsprogs-1.11.2 68 SHA256 5653eec3e1ac3ccc7b3ac2142e49f13a0600f63ec01514c5117190573e51c9e2 files/digest-ntfsprogs-1.11.2 68 @@ -13,6 +13,9 @@ SHA256 289e38411efec0b55bbf115fc1365d49afeac1b7c28053fa54a36ad5f32ee3aa files/di MD5 b6d6974608cc94cae48c680d3e90693f files/digest-ntfsprogs-1.13.0 250 RMD160 241c5ccf6db3bd33b2ed23e3e4b5ff719c73a2e7 files/digest-ntfsprogs-1.13.0 250 SHA256 f9aae297e7d9a19175714733ce310cb8e42292dde30b80fd1e0bb082f5e06f51 files/digest-ntfsprogs-1.13.0 250 +MD5 73527f9a781ac73d0f8c3c6306d94d97 files/ntfsprogs-1.13.0-pkg-config.patch 3485 +RMD160 dab70bf95732dbdb967b41243c3b3a48f823bc71 files/ntfsprogs-1.13.0-pkg-config.patch 3485 +SHA256 4932fe269f43c093e73605360a3b54e2ebf86bda86ca5eac90a76060eb707b54 files/ntfsprogs-1.13.0-pkg-config.patch 3485 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164 @@ -22,13 +25,13 @@ SHA256 3c6e718d54179e3858d6233299b86df4ff5e42c92ee26a9636abd1674557314a ntfsprog MD5 66f6b8c7c63160ec48391f813c90a3d4 ntfsprogs-1.12.1.ebuild 986 RMD160 b0d9ffc8a25165889758054a72dfa8cb9f855966 ntfsprogs-1.12.1.ebuild 986 SHA256 c25e4d7c53b7052d9583330df87a88f0f5b3fb3f6b9b1878c52c181305cec7cc ntfsprogs-1.12.1.ebuild 986 -MD5 06f03a2e8474e3fc0b018e32f0e06d9b ntfsprogs-1.13.0.ebuild 987 -RMD160 9a5b1e36475085efca4311f9ef820125d7cae5ef ntfsprogs-1.13.0.ebuild 987 -SHA256 6d063fdf97536c0cd9ff96aa62fdc5ea00580a71e1f165a0ddfdb0f5e4370652 ntfsprogs-1.13.0.ebuild 987 +MD5 8afcb0de59046e7ae46bdfe35eaf1bfa ntfsprogs-1.13.0.ebuild 1182 +RMD160 22711cfca32b8b62d6d569f9fbcddd0bc6a539ec ntfsprogs-1.13.0.ebuild 1182 +SHA256 6dcc1448be74de7c4ed89acd94b36bbe3bf31c1247613a99ff43a932c1491ba1 ntfsprogs-1.13.0.ebuild 1182 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) -iD8DBQFECl652+ySkm8kpY0RAkVzAKCKL5/InXPA618UF7Z24tlvVzVEZwCeLSbe -ZHOM3U/J9k1iTB98A+aKs1I= -=wCPM +iD8DBQFEC6Sl2+ySkm8kpY0RAv8ZAJ0WxwAJAdO16Tg4P/Avn1LZ1BUm4ACfe64z +mPLxwzW91R3Q41t6yrapwck= +=c7uF -----END PGP SIGNATURE----- diff --git a/sys-fs/ntfsprogs/files/ntfsprogs-1.13.0-pkg-config.patch b/sys-fs/ntfsprogs/files/ntfsprogs-1.13.0-pkg-config.patch new file mode 100644 index 000000000000..6a3ca40a3bd4 --- /dev/null +++ b/sys-fs/ntfsprogs/files/ntfsprogs-1.13.0-pkg-config.patch @@ -0,0 +1,119 @@ +configure fails when using --disable-gnome-vfs --enable-fuse-module because +the configure.ac script doesn't explicitly call PKG_PROG_PKG_CONFIG. + +http://bugs.gentoo.org/124919 + +--- configure ++++ configure +@@ -2184,6 +2184,111 @@ + fi; + + ++ ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. ++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++ ++if test -n "$PKG_CONFIG"; then ++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6 ++else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++fi ++if test -z "$ac_cv_path_PKG_CONFIG"; then ++ ac_pt_PKG_CONFIG=$PKG_CONFIG ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $ac_pt_PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ ++ ;; ++esac ++fi ++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG ++ ++if test -n "$ac_pt_PKG_CONFIG"; then ++ echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 ++else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ PKG_CONFIG=$ac_pt_PKG_CONFIG ++else ++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++fi ++ ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=0.9.0 ++ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 ++ else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++ PKG_CONFIG="" ++ fi ++ ++fi ++ + # This is required to get past a stupid configure bug when making the rpm. + # Basically it is broken to specify the host as a command line argument to + # configure on its own, i.e. without giving --host=. It is supposed to work diff --git a/sys-fs/ntfsprogs/ntfsprogs-1.13.0.ebuild b/sys-fs/ntfsprogs/ntfsprogs-1.13.0.ebuild index 6351d6f9643d..1c471cde53e3 100644 --- a/sys-fs/ntfsprogs/ntfsprogs-1.13.0.ebuild +++ b/sys-fs/ntfsprogs/ntfsprogs-1.13.0.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-1.13.0.ebuild,v 1.2 2006/03/05 03:43:50 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-1.13.0.ebuild,v 1.3 2006/03/06 02:54:21 vapier Exp $ + +inherit eutils DESCRIPTION="User tools for NTFS filesystems" HOMEPAGE="http://www.linux-ntfs.org/" @@ -9,9 +11,10 @@ SRC_URI="mirror://sourceforge/linux-ntfs/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="gnome fuse debug" +IUSE="crypt debug fuse gnome" RDEPEND="fuse? ( >=sys-fs/fuse-2.3.0 ) + crypt? ( >=dev-libs/libgcrypt-1.2.0 >=net-libs/gnutls-1.2.8 ) gnome? ( >=dev-libs/glib-2.0 >=gnome-base/gnome-vfs-2.0 @@ -19,12 +22,19 @@ RDEPEND="fuse? ( >=sys-fs/fuse-2.3.0 ) DEPEND="${RDEPEND} dev-util/pkgconfig" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-pkg-config.patch +} + src_compile() { sed -i -e 's:-ggdb3::' configure econf \ - $(use_enable gnome gnome-vfs) \ + $(use_enable crypt) \ $(use_enable debug) \ $(use_enable fuse fuse-module) \ + $(use_enable gnome gnome-vfs) \ || die "Configure failed" emake || die "Make failed" } |