Revert "Adding make.defaults and indilib_drivers.desc thus introducing USE_EXPAND_INDILIB_DRIVERS"

This reverts commit dcec0bde0a70ed7aabb81cc89051d46bf3217647.

Conflicts:
	sci-libs/indilib-drivers/indilib-drivers-0.9.9.ebuild

3 files changed, 38 insertions, 31 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
deleted file mode 100644
index 528d6b4..0000000
--- a/profiles/base/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.119 2014/12/16 00:17:42 redlizard Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
-
-USE_EXPAND="${USE_EXPAND} INDILIB_DRIVERS"
diff --git a/profiles/desc/indilib_drivers.desc b/profiles/desc/indilib_drivers.desc
deleted file mode 100644
index 0ddc839..0000000
--- a/profiles/desc/indilib_drivers.desc
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/desc/input_devices.desc,v 1.10 2014/06/08 14:43:11 swift Exp $
-
-# This file contains descriptions of INDILIB_DRIVERS USE_EXPAND flags.
-
-aagcloudwatcher - INDILIB_DRIVERS to build support for the AAG Cloud Watcher
-drivers_apogee - INDILIB_DRIVERS to build support for the Apogee Alta (U & E) line of CCDs
-drivers_asicam - INDILIB_DRIVERS to build support for the ZWO Optics ASI cameras 
-drivers_duino - INDILIB_DRIVERS to build support for the Arduino boards
-eqmod - INDILIB_DRIVERS to build support for the mounts compliant to the SkyWatcher Protocol
-fishcamp - INDILIB_DRIVERS to build support for the Fishcamp Engineering's Starfish CMOS autoguider
-fli - INDILIB_DRIVERS to build support for the Finger Lakes Instruments CCD and Focuser
-gphoto - INDILIB_DRIVERS to build support for the gphoto2 compatible cameras
-maxdomeii - INDILIB_DRIVERS to build support for the Maxdome II
-meadedsi - INDILIB_DRIVERS to build support for the Meade Deep Sky Imager
-qhy - INDILIB_DRIVERS to build support for the QHY CCD cameras
-qsi - INDILIB_DRIVERS to build support for the Quantum Scientific Imaging CCDs & Filter Wheels
-sbig - INDILIB_DRIVERS to build support for the Santa Barbra Instruments Group line of CCDs & Filter Wheels
-spectracyber - INDILIB_DRIVERS to build support for the Radio Astronomy Supplies' SpectraCyber hydrogen line spectrometer
-sx - INDILIB_DRIVERS to build support for the SX astronomical equipement
-tess - INDILIB_DRIVERS to build support for the TESS custom stronomical board
\ No newline at end of file
diff --git a/sci-libs/indilib-drivers/indilib-drivers-0.9.9.ebuild b/sci-libs/indilib-drivers/indilib-drivers-0.9.9.ebuild
index 1234b39..1241dcc 100644
--- a/sci-libs/indilib-drivers/indilib-drivers-0.9.9.ebuild
+++ b/sci-libs/indilib-drivers/indilib-drivers-0.9.9.ebuild
@@ -11,8 +11,8 @@ SRC_URI=""
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm"
-
 IUSE_INDILIB_DRIVERS="
+<<<<<<< HEAD
 	aagcloudwatcher
 	apogee
 	asicam
@@ -29,11 +29,30 @@ IUSE_INDILIB_DRIVERS="
 	spectracyber
 	sx
 	tess
+=======
+	+indilib_3rdparty_drivers_aagcloudwatcher
+	+indilib_3rdparty_drivers_apogee
+	+indilib_3rdparty_drivers_asicam
+	+indilib_3rdparty_drivers_duino
+	+indilib_3rdparty_drivers_eqmod
+	+indilib_3rdparty_drivers_fishcamp
+	+indilib_3rdparty_drivers_fli
+	+indilib_3rdparty_drivers_gphoto
+	+indilib_3rdparty_drivers_maxdomeii
+	+indilib_3rdparty_drivers_meadedsi
+	+indilib_3rdparty_drivers_qhy
+	+indilib_3rdparty_drivers_qsi
+	+indilib_3rdparty_drivers_sbig
+	+indilib_3rdparty_drivers_spectracyber
+	+indilib_3rdparty_drivers_sx
+	+indilib_3rdparty_drivers_tess
+>>>>>>> parent of dcec0bd... Adding make.defaults and indilib_drivers.desc thus introducing USE_EXPAND_INDILIB_DRIVERS
 	"
 
 IUSE="${IUSE_INDILIB_DRIVERS}"
 
 PDEPEND="
+<<<<<<< HEAD
 	aagcloudwatcher? ( sci-libs/indilib-driver-aagcloudwatcher )
 	apogee? ( sci-libs/indilib-driver-apogee )
 	asicam? ( sci-libs/indilib-driver-asicam )
@@ -50,4 +69,22 @@ PDEPEND="
 	spectracyber? ( sci-libs/indilib-driver-spectracyber )
 	sx? ( sci-libs/indilib-driver-sx )
 	tess? ( sci-libs/indilib-driver-tess )
+=======
+	indilib_3rdparty_drivers_aagcloudwatcher? ( sci-libs/indilib-driver-aagcloudwatcher )
+	indilib_3rdparty_drivers_apogee? ( sci-libs/indilib-driver-apogee )
+	indilib_3rdparty_drivers_asicam? ( sci-libs/indilib-driver-asicam )
+	indilib_3rdparty_drivers_duino? ( sci-libs/indilib-driver-duino )
+	indilib_3rdparty_drivers_eqmod? ( sci-libs/indilib-driver-eqmod )
+	indilib_3rdparty_drivers_fishcamp? ( sci-libs/indilib-driver-fishcamp )
+	indilib_3rdparty_drivers_fli? ( sci-libs/indilib-driver-fli )
+	indilib_3rdparty_drivers_gphoto? ( sci-libs/indilib-driver-gphoto )
+	indilib_3rdparty_drivers_maxdomeii? ( sci-libs/indilib-driver-maxdomeii )
+	indilib_3rdparty_drivers_meadedsi? ( sci-libs/indilib-driver-meadedsi )
+	indilib_3rdparty_drivers_qhy? ( sci-libs/indilib-driver-qhy )
+	indilib_3rdparty_drivers_qsi? ( sci-libs/indilib-driver-qsi )
+	indilib_3rdparty_drivers_sbig? ( sci-libs/indilib-driver-sbig )
+	indilib_3rdparty_drivers_spectracyber? ( sci-libs/indilib-driver-spectracyber )
+	indilib_3rdparty_drivers_sx? ( sci-libs/indilib-driver-sx )
+	indilib_3rdparty_drivers_tess? ( sci-libs/indilib-driver-tess )
+>>>>>>> parent of dcec0bd... Adding make.defaults and indilib_drivers.desc thus introducing USE_EXPAND_INDILIB_DRIVERS
 	"
\ No newline at end of file