diff options
| author | Ctibor <ctibor.brancik@seznam.cz> | 2015-01-05 18:28:48 +0100 |
|---|---|---|
| committer | Ctibor <ctibor.brancik@seznam.cz> | 2015-01-05 18:28:48 +0100 |
| commit | 01a654682a81c985da27a869e6ffed9b83972f7a (patch) | |
| tree | c478da9a0eef58124195dafb6b21e3d3cb764439 /sci-libs/indilib-drivers | |
| parent | 065881f7277d03eb8b5e48e1f909865dbf160504 (diff) | |
| download | brancik-overlay-01a654682a81c985da27a869e6ffed9b83972f7a.tar.gz brancik-overlay-01a654682a81c985da27a869e6ffed9b83972f7a.tar.bz2 | |
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
Diffstat (limited to 'sci-libs/indilib-drivers')
| -rw-r--r-- | sci-libs/indilib-drivers/indilib-drivers-0.9.9.ebuild | 39 |
1 files changed, 38 insertions, 1 deletions
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 |