Fix app-backup/deja-dup building with newer dev-lang/vala versions an…

…d explicitly enable Unity desktop configure options
shiznix · Aug 30, 2016 · d87c4c4 · d87c4c4
1 parent fd504ca
commit d87c4c4
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/NOTES b/NOTES
@@ -17,6 +17,7 @@ emerge -1 `qdepends -CNQ x11-libs/gtk+ 2> /dev/null`
 	unity-lenses/unity-lens-video
 
 * Reasons for patching/maintaining packages:
+app-backup/deja-dup			# Enable Unity desktop options
 dev-cpp/gtest				# Customised ebuild to install /usr/src/gtest/* files lacking from main tree ebuild
 dev-cpp/gmock				# Customised ebuild to install /usr/src/gmock/* files lacking from main tree ebuild
 dev-libs/dee				# Portage tree versions can lag, maintained for patches and version control

diff --git a/app-backup/deja-dup/Manifest b/app-backup/deja-dup/Manifest
@@ -1,3 +1,3 @@
 DIST deja-dup_34.2.orig.tar.xz 698788 SHA256 ff30732f28233e2422d069f1769a725d4a39c91a279c3bf885c4162fd85818bb SHA512 1c00026b5df53273916031cf72e4fc987d739b7985a9931641cef2afeff4b203e6bd2d9a97e255dd12a0de997d1fe9377c8b9106639312065a55a8206fcaa65f WHIRLPOOL 95c1200061ace9a09ac2309ba6253a608886c462e020da0cc9c14298392aab511b64dbb1aead6114e820408e5a366fa0e89d413fb11ab4daf692b63487d55420
-EBUILD deja-dup-34.2_p0_p01.ebuild 1191 SHA256 64097639596a2d9801993cd5486562e7b09614bff6b11c565c7ce4f269b9fc14 SHA512 2bfa19395f716e3ab694f75ada63cdabf163a6acdb95f097750c9c56fc997da6efcd03749574840d612e25bd3aa2640eb0785d4d9d5bc8226fb87d109a586b14 WHIRLPOOL a8c8b4720a9db1817b1cdcf12c7950df18eb5028c06ddf1c7e7c256574fbed06f909b1926450fa07f34e90d6f4a8793bdf8be1e18a194e850399d2409a773674
+EBUILD deja-dup-34.2_p0_p01-r1.ebuild 1523 SHA256 b7e08acacded6de0ec0624beb6c2fe35db5654f7068b8221a788a21fd88daa33 SHA512 acd205824e8cd41d50b65adaba77b3b0fa6ad00ae6fd8c61483dbdeddef84f5bbb13a86007e53376a5c1a5ae6ac7931534d077859418e8ee3f4b2ddd2ff74421 WHIRLPOOL b24beea431766d714c2fbc2655d9d8c5545eaad5a0a7324492b08980449696bdbd78504fcfae7d7f595b3739fdd82b1ee087dba34eb272e751aea41e2de5d8b5
 MISC metadata.xml 444 SHA256 857489d18761372cac8b1b14a6c8a2779b474f291e323db5fbf509b1c4e65bb4 SHA512 49436c4c9e3fb4d75c57219a7e9d2bacca6f514ad6089a6f85bffb108250059bc4ffb58f5725a8555f971d82e94183b910256ee2079e32a3d9e773af55248ec2 WHIRLPOOL 5fc71978988ef4a505e5524d72e419c1d9c2e0f03dbeb312ad381c39e27719f8a609b2bdb0693c69f8fa0c133b39c893008daaa740b1a060d050ce810c28cc31
diff --git a/...ckup/deja-dup/deja-dup-34.2_p0_p01.ebuild → ...p/deja-dup/deja-dup-34.2_p0_p01-r1.ebuild b/...ckup/deja-dup/deja-dup-34.2_p0_p01.ebuild → ...p/deja-dup/deja-dup-34.2_p0_p01-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 
 URELEASE="xenial"
-inherit cmake-utils ubuntu-versionator vala
+inherit cmake-utils gnome2 ubuntu-versionator vala
 
 UURL="mirror://unity/pool/main/d/${PN}"
 
@@ -16,7 +16,7 @@ SRC_URI="${UURL}/${MY_P}.orig.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+nautilus"
+IUSE="test +nautilus"
 RESTRICT="mirror test"
 
 COMMON_DEPEND="
@@ -43,14 +43,32 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	ubuntu-versionator_src_prepare
+	sed -e '/RPATH/s:PKG_LIBEXECDIR:PKG_LIBDIR:g' \
+		-i CMakeLists.txt || die
 	vala_src_prepare
-	export VALA_API_GEN="$VAPIGEN"
+	gnome2_src_prepare
 	cmake-utils_src_prepare
 }
 
 src_configure() {
-	mycmakeargs+=(-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DVALA_COMPILER=$VALAC
-		-DVAPI_GEN=$VAPIGEN)
+	local mycmakeargs=(
+		-DVALA_EXECUTABLE="${VALAC}"
+		-DENABLE_CCPANEL=ON
+		-DENABLE_PK=OFF
+		-DENABLE_UNITY=ON
+		-DENABLE_UNITY_CCPANEL=ON
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
+		-DENABLE_NAUTILUS="$(usex nautilus)"
+		-DENABLE_TESTING="$(usex test)"
+	)
 	cmake-utils_src_configure
 }
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+}
+