Version bump fix #439262, fix init script wrt #442464

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

5 files changed, 182 insertions, 54 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index c660abf0a04b..16e2a2cde1ed 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/glusterfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.40 2012/09/29 15:38:34 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.41 2012/11/19 13:36:35 ultrabug Exp $
+
+*glusterfs-3.3.1 (19 Nov 2012)
+
+  19 Nov 2012; Ultrabug <ultrabug@gentoo.org> +files/glusterfs-r1.initd,
+  -glusterfs-3.2.6.ebuild, +glusterfs-3.3.1.ebuild:
+  Version bump fix #439262, fix init script wrt #442464 thx to Denis Kaganovich
 
   29 Sep 2012; Kacper Kowalik <xarthisius@gentoo.org> glusterfs-3.3.0.ebuild:
   Show upgrade info unconditionally as REPLACING_VERSIONS doesn't seem to work
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 565bf7b1d030..521c45e91654 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -11,33 +11,24 @@ AUX glusterfs-3.3.0-docdir.patch 756 SHA256 f1af7734b9b886a6de89dbc86deea4917ad8
 AUX glusterfs-3.3.0-parallel-build.patch 618 SHA256 822f6c339541f7a10e01efcbb04214d4628a08e766e742d5891fb28975624e5e SHA512 697e5aca20f47813e7c6fa237e150eec0937135207e710edf1fda3ab3b90b8c116a32f970f22816074928ddcd1040977576e015cce9b42767c54abd8b75fade1 WHIRLPOOL 343ed65732137bca28ff1ed22825dcc617f298fbb2506cae79de3695534ea9ffce6e9880316f5d09ef33d13e42c6a298849ca49ddccf7060cca298e71a5311d1
 AUX glusterfs-3.3.0-silent_rules.patch 611 SHA256 6795dce0036131827fb10da67912bc5d6a675697d7d2bbc135790917b9917cf2 SHA512 057c4ffbf8c229a57ae652b93e4c92e7e2a222c4d9dbdd1b44b5da1a47eb3462960698cb3a27ed5f83dcf75e7e9ed515ece3e82a10a41da02bcb5af63d6df63c WHIRLPOOL a2cf7ea041aa0a0ee8d398c7d75ae68e144389301dc1c4a243c0e2c1db332223f48b775f432d5468b1464770fe12ef0362d3178f771d2b4346dc864865a99a29
 AUX glusterfs-docdir.patch 1644 SHA256 d2922af3e15faae8ae06102a757b158b510b27cc11ad9ffe643ca67e2046ba07 SHA512 df942eb947c5568f78757a4629389cb5fc5b436ebf4f9ae15c95fb09549b20f939b4bbf5fc478ced803230f31f15373fad73cfc810f79f737cd0f4d7de3321e3 WHIRLPOOL 5ec4e6b02d0bd83632339f3889a2673bff027a116953ecf282b24ea26cb295a9ddbb489ee76788549ebeae262ae3bc7e36b8047b4ddeda0edeca37bb6126e317
+AUX glusterfs-r1.initd 3187 SHA256 2feecfabc353f6210b5f39c3a93e8eb9fa0a62dca6aa32dd9bf6796220b8fb49 SHA512 3129c5201de92d596a8ecd182b411d77093318c7a2a0b064a0111c0498cfb61d821a2922f9075cb991c965027a0494ef2bf49285e07bd816c2f28b8a5775bfc6 WHIRLPOOL 782ac2629a870ba835378e27e0af5195b9bb19da76ef3fc2a99d4140022c7697f36a03c13b0fc8c389367bd92cad377a80307ae982d7d8d1f2ecc6a0533009a2
 AUX glusterfs.confd 129 SHA256 a9023ba1112ceb4597c654228f0beb0053ed695aeb32c65e0749a7157fab563d SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4 WHIRLPOOL 114f076456845087bf4dc28fb179cfea335f5f03b1d16098d836b5b0487c46fba4ee48d0bfab8cff7b2326b9585b327271d5c1d402db8289cafdf29f70ac063d
 AUX glusterfs.initd 3134 SHA256 ffa622d26add72dafc1b1f8e6de716b14a6d99911888a344dc7d236fb7667d6e SHA512 f4130303d892c1866efc9a1cff592ca9d62108455f910b92576950bffeb849e0854bd0f5faa0678efcd30a4b2d51370d7563d23fc14ffa954d419945dd3a3f96 WHIRLPOOL 452918fc22895cb4d2fea7fb19641c42eeac8964cf588cb5981ad1e551062e4a0648818135af196203ff228152360fe0740c4c4f6fc334b5ac6b9ba489a69cba
 AUX glusterfs.vim 139 SHA256 f214c1c8a01c9184b535fa7ae307200a8a1dc83fd42e92bdd57a7b1cae1dc099 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7 WHIRLPOOL 3006d9fea924fe274ac00dc5d711cfe642f347808889c3d5dbde764f0f0cd2ab27509fa75d37b95ccd98c33bc1db8d082e5d16a26e0f888b7189f9738b6ff963
 DIST glusterfs-3.1.2.tar.gz 2086469 SHA256 9a4e910431f572aa180a3ad1821f7524773ec1e8f06342c4040f26619f832838
-DIST glusterfs-3.2.6.tar.gz 2420250 SHA256 8e3f23c70e25225239f2f544066b0be28800419c6b23f2384f2d8822af3bd269
 DIST glusterfs-3.2.7.tar.gz 2424292 SHA256 464c089ff9da5a8e17f7caeae48f1cad59973489dfe940a9f0d8db8bc14cd6c4
 DIST glusterfs-3.3.0.tar.gz 2599586 SHA256 76d80ded9ecc5146131e9d59b03cbe09a18338ff0b32922b12fd453da6104f17 SHA512 d450c91e6326a89c39e5c7a17b0e7493318a642fbccf8c729a841adcc422388a300b8fd852f9f978098dc87d956a697b681be5287502b5dc0ab29c71e6b8b9c7 WHIRLPOOL 4836a6aa17de011d2fa94121934972e6d15e434f392f713edc2b9b1e7ef8648a31f209c9dc85fc7a5e0ae0f1e902797ae49726304390b7d14596103958ea58d9
+DIST glusterfs-3.3.1.tar.gz 2636698 SHA256 19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519 SHA512 c32e95a0e4568a62fabcf0c52ad3d6a173b62c5536006c3680e3efd1240e2a68177e14891e11d1d16eff5eb67bf60108dbd44151c26241203d8ddb58f0270c69 WHIRLPOOL 30316bbdb7087dd32d35f0f017ea461711830f5450984edb6d6c527d7f9cae5ee307601887cf489a2d675180d1f21a77ac7901f37f44cc860cccbe510c5a18bf
 EBUILD glusterfs-3.1.2.ebuild 3647 SHA256 e2835d83bf6e03f4b0bb9d4f7dd2749d0454204e401444a357fb4371d90c9be3 SHA512 ba02e24cc76ab53059ec76ce9f84aafdd2e1ea47ba9e34390f4f73bfc170a4037e65795af3d17315c19d5cb50f1e784d095cf2129d8debc102fb2305c1637def WHIRLPOOL f0f4285e4c3dbf0704c2e3770891f5997dd4468ff8b9e944f3a14e0e607744382451edd9afc05b6d485efef69d54a48b8ae20b3efb7103b6dee8ecf33a3d2122
-EBUILD glusterfs-3.2.6.ebuild 3698 SHA256 d8325f1497215f72590dd0022f52f51b2d31b0d00bf2f4a11946c550ef03b202 SHA512 f2f30fcaaab4853bae2d3326c55cae00918d26dc7d998ca15dc9a76e62a57577b9428e03e4aab517f2de4b477b5d0a790351a5b21a0e4b2dd7920b50d73e8113 WHIRLPOOL e05d4ab7c82ed8858bcf79b0d03d3fd56ee9aac7b2417eae5f4564c682545b54781887ca699c539ffc267218f99e9276104c41145ae6d9cb82ffa57fc782c630
 EBUILD glusterfs-3.2.7.ebuild 3702 SHA256 2a32929580fad41bf449a79bc4e5d195bbab6c8560f0a937b9bdadb790fe7ff3 SHA512 2a9530fb240f220d9e3581053edf4fe18f1545223386c03e2b4f1a36fe2832cd8abc33110d234160bfc4a07f2532e1f2a7f4c976253b5fb45ef3a71b99833dde WHIRLPOOL 5a3d7d1b6349a266d2bdeb9be3061610c99bf8338cc724dba70d9db55e37b2a1fb10e798ae13130f010cc88445f58aa3006b459bf502184898de3c36cd21c3c5
-EBUILD glusterfs-3.3.0.ebuild 3799 SHA256 bc32df786c07c6cbb422602d0de9b51b6f83487381004c92f788233955fec2c6 SHA512 fbbf8942f3ee6e66225f21e8cd7a41a0d9eae80d06801220e68c1e8c06f95b39b92a87b967f207223f129bf32236a8527019e58a3b9e173a3c579b34259cfea6 WHIRLPOOL 9df661385bb601a93b272a96b9f10053ccc7daf5eda07cc8d2cd582feefdb199c51a79ae34db15eafb4c01e463b26691284a52320fc7f54c9f6e211e30b18181
-MISC ChangeLog 7431 SHA256 0fefae5cfd8637910e82d990532cf459c655b4a4bde66f26e9c17a4f8765dbeb SHA512 b7e5074da2fd34c3b68684b352a647dfda9dc340cea595d1f4ef2fef3b4cd9e748dd848542680e058fdc99ac957b4d059d294b52f678df00b317eb9481eaf940 WHIRLPOOL a13d6c88976da55ec1b94c32dcac486abd8d700cd2f329b4ea9f0308c71f3cbd6eaa004ff2d933696d43fc6e24413aca761e4ca98d0f55bbb6756de7d7c77fff
+EBUILD glusterfs-3.3.0.ebuild 3794 SHA256 aa41cf11fad03bb8512184bdd4eb5ab579e89233d44146e0836785b39a2f1b59 SHA512 9111bda6144aa1e51c265b1f1a35f0d492a87862e1260d6564d93716b711f98a66d8566f2c0b01abfc582f56f4212d0c45aaffa38faa7205311f85354a7519ed WHIRLPOOL 6eefd66ff924765ad0722f7c7103a70c6992aac94c66817e836e4c3ef57bb9c0b9b668e6979a01d3c75d9b13761f89ed84aa0e9f8bbc75b4f9e773d9e6a45eeb
+EBUILD glusterfs-3.3.1.ebuild 3830 SHA256 f3300d954e8c39c1fa00c178f36144fd9c7764959cfeb7b06a703efa3ca0ec50 SHA512 f68375c972f081be7ae9e126d55327d9edab1c36802082b091a1786058cc7222dc286255420c73f984e0fa0cf8a6dff302da1c4119219a5e16bac0fa2f895d5a WHIRLPOOL 7e7afeda0df5cdf1627ca6e84cefb5327894b6b4ba3dcb40d577223f11761a9aaf748a03a5af766bd7df23218be9aa921841f5c8b695a6bddcd854a076dd5843
+MISC ChangeLog 7667 SHA256 868e49b0341a0af721e2af64dab4d524ab56e53163eb841ed2feb9e61fb07861 SHA512 377785d7864ca4f555a847fecc9dd36d9d9a66dc47777a560bd834c785ed544fb3e1a85ec2aeaba6487653f4ff286df4dc1de759eb25d205846c24b5dfb09f63 WHIRLPOOL bf11d2aa5221d1e5ab3ada973079e0a559aade719d16896597d0ae460b3dfec461c43c4a74502ba1af1f0554c7af64aa1c6e30190378cc50ab78263990b28983
 MISC metadata.xml 842 SHA256 2a717e590d518af4d7eec71b92cacece17c0cb0c3283f37793e093b2def0ae04 SHA512 0ace66dd24c50dfc83b3d5a9976e484cca7a4696cd0f8a1b3a493904a8ee85a7f7351f6b501e5dde76bcda0df56b77a1fc78d04a80b6552b84103af61a0ec5bf WHIRLPOOL e749e06d2195da375002d73ed2bc9b22a4e5fb5c619703d7fd80544e6d83ce02823239a8b89b0d03499ab14fe50dd095fe95da272e5daf4469ee4387d52d668a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQZxYBAAoJEF0huFKJUZL5a7MP/0yqjKoqkr/7PwidaX3KOsxE
-z7fgmBzjYQYBCo+rUYt5eSmFPr8KzlMhqm28jKfI6x4wOX7p+Pn8N8HCBgcjX911
-Kz9gsji2mTc/sSoor9RoJdVEyCx0FPL8SMQPxEY3Rgln7Se0xM5LyfackH48/NcD
-d6yzsaANgfKUpGqn6o3o6iKRoNhUU2RjoGKSc1f3kE2j44yBb4RIuHiFUkrC9MDF
-e8vX5NQGqTVlj7lzJL3kcKJRrnkgf3qU2ylJ+26fz8m+oNfqiT2FIs7THc3PE+Vl
-vsqc3zBqOtPuEj9kQV+MVlwnpU3P9YATyHJKxPgMm0ZIKthivJTNwrptwxMnG0Nk
-w9a2ooOqAMtSOgF/qCcnuJMzCq6RGKOrJCuAQ3UHgEtkW+T0ugZm4/d+BQbyf7Q0
-1Ui8K7EGYniuHexEVuehMLmCuFiwCXDKktF/+0NotYvPeAAxyubZXREYbOyP8IIb
-CzIey/hKgp1zp38jEeBNwobU4bv109kvZRF07M/lqTSJ8/KFhSV1bzELUSIohjrT
-7hfdiIhdGmBd2Vru481rpS7NqTwiWHqu8yyMKJOxJTdHjBYWvp1V/8HAs8lTTpWV
-7qxoIUpcW78+zq6WawDAgeNvOBVGu+MoGgyiXzpbXvGneQ+YTaXY2qko3uiJwHDE
-Es0u0qmiISMDD2oktLit
-=Do0E
+iF4EAREIAAYFAlCqNekACgkQKiQSS7ZY+hNTAAD+OfucKFYxys15xaFXSWfHqGKS
+oxbkv2GgtcuX8xDAzYUBALRIJvLdrmILVKnfMxkLWAiFNUFcGvMZ/D8AdHi+hElH
+=XLUJ
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/files/glusterfs-r1.initd b/sys-cluster/glusterfs/files/glusterfs-r1.initd
new file mode 100644
index 000000000000..fd054bd4a56e
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-r1.initd
@@ -0,0 +1,122 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/files/glusterfs-r1.initd,v 1.1 2012/11/19 13:36:35 ultrabug Exp $
+
+if [[ "${SVCNAME}" != "glusterfs" ]]
+then
+	GLUSTERFS_NAME="${SVCNAME#glusterfs.}"
+else
+	GLUSTERFS_NAME="glusterfs"
+fi
+
+GLUSTERFS_PIDFILE="/var/run/${SVCNAME}.pid"
+
+eval 'GLUSTERFS_LOGFILE="${'${GLUSTERFS_NAME}'_log:-/var/log/glusterfs/'${GLUSTERFS_NAME}'.log}"'
+eval 'GLUSTERFS_VOLFILE="${'${GLUSTERFS_NAME}'_vol:-/etc/glusterfs/'${GLUSTERFS_NAME}'.vol}"'
+eval 'GLUSTERFS_SERVER="${'${GLUSTERFS_NAME}'_server}"'
+eval 'GLUSTERFS_PORT="${'${GLUSTERFS_NAME}'_port:-6996}"'
+eval 'GLUSTERFS_TRANSPORT="${'${GLUSTERFS_NAME}'_transport:-socket}"'
+eval 'GLUSTERFS_OPTS="${'${GLUSTERFS_NAME}'_opts}"'
+eval 'GLUSTERFS_MOUNTPOINT="${'${GLUSTERFS_NAME}'_mountpoint}"'
+
+depend() {
+	need net 
+	[[ -n "${GLUSTERFS_MOUNTPOINT}" ]] && need fuse
+	use dns
+	before netmount
+	after firewall ntp-client ntpd
+}
+
+checkconfig() {
+	if [[ -z "${GLUSTERFS_NAME}" ]]
+	then
+		eerror "The service name is not properly formatted."
+		return 1
+	fi
+
+	if [[ -z "${GLUSTERFS_SERVER}" ]]
+	then
+		if [[ -z "${GLUSTERFS_VOLFILE}" ]]
+		then
+			eerror "No GlusterFS volume file source has been defined.  Edit /etc/conf.d/glusterfs"
+			eerror "and configure a volume file source for ${SVCNAME}."
+			return 1
+		else
+			if [[ ! -f "${GLUSTERFS_VOLFILE}" ]]
+			then
+				eerror "Cannot find volume file: ${GLUSTERFS_VOLFILE}"
+				return 1
+			fi
+		fi
+	fi
+
+	if [[ -n "${GLUSTERFS_MOUNTPOINT}" && ! -d "${GLUSTERFS_MOUNTPOINT}" ]]
+	then
+		eerror "The mountpoint ${GLUSTERFS_MOUNTPOINT} does not exist."
+		return 1
+	fi
+}
+
+start() {
+	local status daemon
+
+	checkconfig || return 1
+
+	ebegin "Starting GlusterFS (${SVCNAME})"
+	eindent
+
+	if [[ -z "${GLUSTERFS_MOUNTPOINT}" ]]
+	then
+		einfo "Starting in server mode ..."
+		daemon="glusterfsd"
+	else
+		einfo "Starting in client mode. Mounting filesystem ..."
+		daemon="glusterfs"
+	fi
+
+	if [[ -n "${GLUSTERFS_SERVER}" ]]
+	then
+		einfo "Using server supplied volume file"
+		start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \
+			--exec /usr/sbin/${daemon} -- \
+			--pid-file=${GLUSTERFS_PIDFILE} \
+			--log-file=${GLUSTERFS_LOGFILE} \
+			--volfile-server=${GLUSTERFS_SERVER} \
+			--volfile-server-port=${GLUSTERFS_PORT} \
+			--volfile-server-transport=${GLUSTERFS_TRANSPORT} \
+			${GLUSTERFS_OPTS} ${GLUSTERFS_MOUNTPOINT}
+		status="$?"
+	else
+		einfo "Using local volume file"
+		start-stop-daemon --start --pidfile ${GLUSTERFS_PIDFILE} \
+			--exec /usr/sbin/${daemon} -- \
+			--pid-file=${GLUSTERFS_PIDFILE} \
+			--log-file=${GLUSTERFS_LOGFILE} \
+			--volfile=${GLUSTERFS_VOLFILE} \
+			${GLUSTERFS_OPTS} ${GLUSTERFS_MOUNTPOINT}
+		status="$?"
+	fi
+
+	eoutdent
+	eend ${status}
+}
+
+stop() {
+	local status
+
+	ebegin "Stopping GlusterFS (${SVCNAME})"
+	eindent
+	if [[ -z "${GLUSTERFS_MOUNTPOINT}" ]]
+	then
+		einfo "Stopping server process ..."
+		start-stop-daemon --stop --pidfile ${GLUSTERFS_PIDFILE}
+		status="$?"
+	else
+		einfo "Unmounting ${GLUSTERFS_MOUNTPOINT} ..."
+		umount "${GLUSTERFS_MOUNTPOINT}"
+		status="$?"
+	fi
+	eoutdent
+	eend ${status}
+}
diff --git a/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild b/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild
index 34b5dfc4f0c3..be48c986f392 100644
--- a/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild,v 1.2 2012/09/29 15:38:34 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild,v 1.3 2012/11/19 13:36:35 ultrabug Exp $
 
 EAPI=4
 
@@ -119,7 +119,7 @@ pkg_postinst() {
 	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
 	ewarn "run GlusterFS."
 
-    elog
+	elog
 	elog "You are upgrading from a previous version of ${PN}, please read:"
 	elog "http://vbellur.wordpress.com/2012/05/31/upgrading-to-glusterfs-3-3/"
 
diff --git a/sys-cluster/glusterfs/glusterfs-3.2.6.ebuild b/sys-cluster/glusterfs/glusterfs-3.3.1.ebuild
index 248227e1325f..b989c0b12e10 100644
--- a/sys-cluster/glusterfs/glusterfs-3.2.6.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.3.1.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.2.6.ebuild,v 1.2 2012/05/04 07:20:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.3.1.ebuild,v 1.1 2012/11/19 13:36:35 ultrabug Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="2"
-inherit autotools elisp-common eutils multilib python versionator
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils elisp-common eutils multilib python versionator
 
 DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
 HOMEPAGE="http://www.gluster.org/"
-SRC_URI="http://ftp.gluster.com/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
+SRC_URI="http://download.gluster.com/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
@@ -17,8 +19,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
 
 RDEPEND="emacs? ( virtual/emacs )
-		fuse? ( >=sys-fs/fuse-2.7.0 )
-		infiniband? ( sys-infiniband/libibverbs )"
+	fuse? ( >=sys-fs/fuse-2.7.0 )
+	infiniband? ( sys-infiniband/libibverbs )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/bison
@@ -26,39 +28,50 @@ DEPEND="${RDEPEND}
 
 SITEFILE="50${PN}-mode-gentoo.el"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.0-parallel-build.patch"
+	"${FILESDIR}/${PN}-3.3.0-docdir.patch"
+	"${FILESDIR}/${PN}-3.3.0-silent_rules.patch"
+	"${FILESDIR}/${PN}-3.3.0-avoid-version.patch"
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.1.0-parallel-build.patch" \
-		"${FILESDIR}/${PN}-docdir.patch" \
-		"${FILESDIR}/glusterd-3.2.0-workdir.patch"
-	sed -i -e "s/ -ggdb3//g" -e "s/ -m64//g" argp-standalone/configure.ac || die
-	eautoreconf
+	sed -e "s/ -ggdb3//g" \
+		-i argp-standalone/configure.ac || die
+	autotools-utils_src_prepare
+	cd argp-standalone && eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_enable fuse fuse-client) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		--enable-georeplication \
-		--disable-bdb \
-		--docdir=/usr/share/doc/${PF} \
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--disable-silent-rules
+		$(use_enable fuse fuse-client)
+		$(use_enable infiniband ibverbs)
+		$(use_enable static-libs static)
+		--enable-georeplication
+		--docdir=/usr/share/doc/${PF}
 		--localstatedir=/var
+	)
+	autotools-utils_src_configure
 }
 
 src_compile() {
-	emake
+	autotools-utils_src_compile
 	if use emacs ; then
 		elisp-compile extras/glusterfs-mode.el || die
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	autotools-utils_src_install
 
 	if use emacs ; then
 		elisp-install ${PN} extras/glusterfs-mode.el* || die
@@ -66,20 +79,18 @@ src_install() {
 	fi
 
 	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}/glusterfs.vim"
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/glusterfs.vim
+		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
 	fi
 
 	if use extras ; then
-		newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize
-		newbin extras/backend-cleanup.sh glusterfs-backend-cleanup
-		newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute
-		newbin extras/disk_usage_sync.sh glusterfs-disk-usage-sync
+		newbin extras/backend-xattr-sanitize.sh ${PN}-backend-xattr-sanitize
+		newbin extras/backend-cleanup.sh ${PN}-backend-cleanup
+		newbin extras/migrate-unify-to-distribute.sh ${PN}-migrate-unify-to-distribute
+		newbin extras/disk_usage_sync.sh ${PN}-disk-usage-sync
 	fi
 
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-
-	newinitd "${FILESDIR}/${PN}.initd" glusterfsd
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
 	newinitd "${FILESDIR}/glusterd.initd" glusterd
 	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
 
@@ -105,14 +116,12 @@ pkg_postinst() {
 	elog "You can now treat glusterfsd2 like any other service"
 	elog
 	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers.  Setup a NTP synchronizing service before attempting to"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
 	ewarn "run GlusterFS."
 
-	if [[ ${REPLACING_VERSIONS} < 3.1 ]]; then
-		elog
-		elog "You are upgrading from a previous version of ${PN}, please read:"
-		elog "http://www.gluster.com/community/documentation/index.php/Gluster_3.0_to_3.2_Upgrade_Guide"
-	fi
+	elog
+	elog "You are upgrading from a previous version of ${PN}, please read:"
+	elog "http://vbellur.wordpress.com/2012/05/31/upgrading-to-glusterfs-3-3/"
 
 	use emacs && elisp-site-regen
 }