--- ../../dev-util/quilt/quilt-0.60.ebuild	2012-05-19 12:13:25.000000000 +0200
+++ dev-util/quilt/quilt-0.60.ebuild	2012-10-12 18:06:24.000000000 +0200
@@ -16,6 +16,8 @@
 RDEPEND="sys-apps/ed
 	dev-util/diffstat
 	graphviz? ( media-gfx/graphviz )
+	ppc-macos? ( app-misc/getopt )
+	x86-macos? ( app-misc/getopt )
 	>=sys-apps/coreutils-8.5"
 
 PDEPEND="emacs? ( app-emacs/quilt-el )"
@@ -43,7 +45,7 @@
 
 src_compile() {
 	local myconf=""
-	[[ ${CHOST} == *"-darwin"* ]] && myconf="${myconf} --without-getopt"
+	[[ ${CHOST} == *"-darwin"* ]] && myconf="${myconf} --with-getopt=${EROOT}/usr/bin/getopt-long"
 	econf ${myconf}
 	emake
 }
@@ -59,7 +61,7 @@
 	newbashcomp bash_completion ${PN}
 
 	# Remove the compat symlinks
-	rm -rf "${ED}"/usr/share/quilt/compat
+	[[ ${CHOST} == *"-darwin"* ]] || rm -rf "${ED}"/usr/share/quilt/compat
 
 	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
 	rm -rf "${ED}"/usr/share/emacs