3 files changed, 6 insertions, 6 deletions
diff --git a/app-portage/gentoopm/gentoopm-0.2.9.ebuild b/app-portage/gentoopm/gentoopm-0.2.9.ebuild
index 068c844f927b..d3fb4d92cfa3 100644
--- a/app-portage/gentoopm/gentoopm-0.2.9.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.2.9.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://bitbucket.org/mgorny/gentoopm/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/gentoopm/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index 75bdae3a46cf..00ffce28a599 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 #if LIVE
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
+HOMEPAGE="https://github.com/mgorny/gentoopm.git"
 inherit git-r3
 #endif
 
 DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://bitbucket.org/mgorny/gentoopm/"
+HOMEPAGE="https://github.com/mgorny/gentoopm/"
 SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD-2"
diff --git a/app-portage/gentoopm/metadata.xml b/app-portage/gentoopm/metadata.xml
index b89e54703628..1ddb67ad7e6c 100644
--- a/app-portage/gentoopm/metadata.xml
+++ b/app-portage/gentoopm/metadata.xml
@@ -10,7 +10,7 @@
       <email>mgorny@gentoo.org</email>
       <name>Michał Górny</name>
     </maintainer>
-    <bugs-to>https://bitbucket.org/mgorny/gentoopm/issues/</bugs-to>
-    <remote-id type="bitbucket">mgorny/gentoopm</remote-id>
+    <bugs-to>https://github.com/mgorny/gentoopm/issues/</bugs-to>
+    <remote-id type="github">mgorny/gentoopm</remote-id>
   </upstream>
 </pkgmetadata>