--- /usr/portage/media-gfx/gphoto2/gphoto2-2.1.6.ebuild	2005-11-26 07:39:31.000000000 +0900
+++ /usr/local/overlays/portage/media-gfx/gphoto2/gphoto2-2.2.0.ebuild	2006-07-03 16:09:47.742317250 +0900
@@ -17,7 +17,7 @@
 # aalib -> needs libjpeg
 RDEPEND=">=dev-libs/libusb-0.1.8
 	dev-libs/popt
-	>=media-libs/libgphoto2-2.1.6
+	>=media-libs/libgphoto2-2.2.0
 	ncurses? ( dev-libs/cdk )
 	aalib? ( media-libs/aalib
 		media-libs/jpeg )
@@ -29,29 +29,13 @@
 src_compile() {
 	eautoreconf
 
-	# -pipe does no work
-	# liquidx: why doesn't it work? bug #?
-	# filter-flags -pipe
-
 	local myconf
-	use nls \
-		|| myconf="${myconf} --disable-nls"
-
-	# command-line frontend
-	use ncurses \
-		&& myconf="${myconf} --with-cdk-prefix=/usr" \
-		|| myconf="${myconf} --without-cdk"
-
-	use aalib \
-		&& myconf="${myconf} --with-jpeg-prefix=/usr" \
-		|| myconf="${myconf} --without-aalib --without-jpeg"
-
-	use exif \
-		&& myconf="${myconf} --with-exif-prefix=/usr" \
-		|| myconf="${myconf} --without-exif"
-
-	use readline \
-		||  myconf="${myconf} --without-readline"
+	myconf="${myconf} `use_enable nls` \
+		`use_with exif` \
+		`use_with readline` \
+		`use_with aalib jpeg` \
+		`use_with aalib` \
+		`use_with cdk`"
 
 	econf ${myconf} || die "econf failed"
 	emake || die