punt every trace of the IMOBILEDEVICE_BACKEND experiment

4 files changed, 4 insertions, 23 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 9c600e302db3..fe9e4588855a 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6413 2012/04/12 02:42:02 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6414 2012/04/12 14:44:29 ssuominen Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
@@ -107,11 +107,6 @@
   03 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> package.mask:
   Lastrite media-libs/tunepimp wrt #409257
 
-  03 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
-  +desc/imobiledevice_backend.desc:
-  New IMOBILEDEVICE_BACKEND. See base/make.defaults too. Related to
-  app-pda/libimobiledevice.
-
   02 Apr 2012; Pacho Ramos <pacho@gentoo.org> package.mask:
   libdlna and ushare are fixed now
 
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 7f8cb411f703..edc46ca9d00f 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.379 2012/04/12 04:14:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.380 2012/04/12 14:44:29 ssuominen Exp $
 
   12 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.use.mask:
   Mask gtkmm[wayland] since it needs gtk+[wayland].
@@ -17,10 +17,6 @@
   05 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> package.use.mask:
   Unmask USE="q64" for media-gfx/imagemagick >= 6.7.6.4 wrt #401327
 
-  03 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> make.defaults:
-  Use IMOBILEDEVICE_BACKEND USE_EXPAND. See
-  profiles/desc/imobiledevice_backend.desc.
-
   31 Mar 2012; Davide Pesavento <pesa@gentoo.org> package.use.mask:
   Update mask of c++0x and qpa USE flags to include Qt 4.8.1.
 
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index bfdbffb82e65..24b5e2955dbc 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.77 2012/04/04 18:13:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.78 2012/04/12 14:44:29 ssuominen Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org.
-USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS IMOBILEDEVICE_BACKEND CURL_SSL"
+USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
diff --git a/profiles/desc/imobiledevice_backend.desc b/profiles/desc/imobiledevice_backend.desc
deleted file mode 100644
index ca12b493a344..000000000000
--- a/profiles/desc/imobiledevice_backend.desc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/desc/imobiledevice_backend.desc,v 1.1 2012/04/03 04:58:15 ssuominen Exp $
-
-# This file contains descriptions of IMOBILEDEVICE_BACKEND USE_EXPAND flags.
-
-# Keep it sorted.
-
-gnutls - Use GnuTLS as imobiledevice backend
-openssl - Use OpenSSL as imobiledevice backend